From 85d33c2a856cd84271cd00922521e13e2eb6b2fb Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 30 Jul 2007 01:57:02 +0000 Subject: [PATCH] 2007-07-29 Don Allingham * src/Merge/_MergePerson.py (MergePeople.copy_note): convert to the new notelist format (#0001130) svn: r8789 --- ChangeLog | 4 ++++ src/Merge/_MergePerson.py | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f71c7c0e..d64bca47b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-07-29 Don Allingham + * src/Merge/_MergePerson.py (MergePeople.copy_note): convert to the + new notelist format (#0001130) + 2007-07-29 Brian Matherly * src/plugins/MarkerReport.py: Typo. diff --git a/src/Merge/_MergePerson.py b/src/Merge/_MergePerson.py index 21ae27e67..8919687f2 100644 --- a/src/Merge/_MergePerson.py +++ b/src/Merge/_MergePerson.py @@ -452,9 +452,7 @@ class MergePeople: new.add_media_reference(photo) # note - note1 = self.p1.get_note_object() - note2 = self.p2.get_note_object() - new.set_note_object(self.merge_notes(note1,note2)) + new.set_note_list(self.p1.get_note_list() + self.p2.get_note_list()) def merge_gramps_ids(self,new): """