From eac4f6062edd0d7df187634d3abd9a479d222165 Mon Sep 17 00:00:00 2001 From: Yohan Graterol Date: Sun, 9 Nov 2014 21:28:03 -0500 Subject: [PATCH] Fix merge in docs/changelog.rst --- docs/changelog.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index d0af955e..d1714e78 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,13 +5,10 @@ Changelog Changes in 0.9.X - DEV ====================== -<<<<<<< HEAD - OperationError: Shard Keys are immutable. Tried to update id even though the document is not yet saved #771 - with_limit_and_skip for count should default like in pymongo #759 - Fix storing value of precision attribute in DecimalField #787 -======= - Set attribute to None does not work (at least for fields with default values) #734 ->>>>>>> bdbd495a9e778d12157b789a74e0e00a303b5efd - Querying by a field defined in a subclass raises InvalidQueryError #744 - Add Support For MongoDB 2.6.X's maxTimeMS #778 - abstract shouldn't be inherited in EmbeddedDocument # 789