Merge branch 'master' into develop

nvbn · Nov 5, 2013 · a831284 · a831284
2 parents 22f24d6 + c563662
commit a831284
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/everpad/provider/models.py b/everpad/provider/models.py
@@ -46,8 +46,7 @@ class Note(Base):
     action = Column(Integer)
     conflict_parent = relationship("Note", post_update=False)
     conflict_parent_id = Column(
-        Integer, ForeignKey('notes.conflict_parent_id'),
-        nullable=True,
+        Integer, ForeignKey('notes.id'), nullable=True,
     )
 
     # sharing data:
@@ -108,7 +107,7 @@ def place_dbus(self, val):
 
     @property
     def conflict_parent_dbus(self):
-        if self.conflict_parent:
+        if self.conflict_parent_id:
             return self.conflict_parent_id
         return 0