Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-02-11 Don Allingham <don@gramps-project.org>

Browse Source 
* src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on 
	add_source_reference



svn: r8086
This commit is contained in:
Don Allingham 2007-02-11 18:21:58 +00:00
parent 30fa577b06
commit bfa8c94aeb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2007-02-11 Don Allingham <don@gramps-project.org>
* src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on
add_source_reference
2007-02-07 Zsolt Foldvari <zfoldvar@users.sourceforge.net> 2007-02-07 Zsolt Foldvari <zfoldvar@users.sourceforge.net>
* src/DisplayTabs/_NoteTab.py: move "rich text" notes to 2.3 branch. * src/DisplayTabs/_NoteTab.py: move "rich text" notes to 2.3 branch.

2
gramps2/src/Merge/_MergePlace.py
View File

@ -133,7 +133,7 @@ class MergePlaces(ManagedWindow.ManagedWindow):
# Copy sources from P2 to P1 # Copy sources from P2 to P1
for source in self.p2.get_source_references(): for source in self.p2.get_source_references():
self.p1.add_source(source) self.p1.add_source_reference(source)
# Add notes from P2 to P1 # Add notes from P2 to P1
if self.note_conflict: if self.note_conflict: