* src/DataViews/_PersonView.py: Merge module support
* src/Merge/_MergeSource.py: broken out of MergeData.py * src/Merge/__init__.py: support of module * src/Merge/Makefile.am: added * src/Merge/_MergePlace.py: broken out of MergeData.py * src/Merge/_MergePerson.py: renamed svn: r6778
This commit is contained in:
@@ -221,7 +221,7 @@ class PlaceView(PageView.ListView):
|
||||
"control key while clicking on the desired place.")
|
||||
ErrorDialog(msg,msg2)
|
||||
else:
|
||||
import MergeData
|
||||
MergeData.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])
|
||||
import Merge
|
||||
Merge.MergePlaces(self.dbstate, self.uistate, mlist[0], mlist[1])
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user