Fix merge in tests/document/instance.py

2014-11-09 21:19:05 -05:00
parent 1bdc3988a9 bdbd495a9e
commit 57d772fa23
3 changed files with 43 additions and 8 deletions
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,9 +5,13 @@ 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