Changing the way of how formatted Notes are stored:

remove 'Markup' optional parameter from gen.lib.note.Note.get() method. svn: r10288
2008-03-13 10:44:22 +00:00
parent 50ab0b0651
commit 2642641b84
7 changed files with 7 additions and 46 deletions
--- a/src/Merge/_MergePerson.py
+++ b/src/Merge/_MergePerson.py
@@ -915,8 +915,8 @@ class MergePeople:
            print "Deleted empty family %s" % family_handle

    def merge_notes(self, note1, note2):
-        t1 = note1.get(markup=True)
-        t2 = note2.get(markup=True)
+        t1 = note1.get()
+        t2 = note2.get()
        if not t2:
            return note1
        elif not t1: