Conflicts resolved in:
/data/grampsxml.dtd
/data/grampsxml.rng
/src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
/src/plugins/import/ImportXml.py
(Various property conflicts also resolved)
svn: r18405
Conflicts resolved in:
/data/grampsxml.dtd
/data/grampsxml.rng
/src/Filters/Rules/Repository/_MatchesNameSubstringOf.py
/src/plugins/import/ImportXml.py
(Various property conflicts also resolved)
svn: r18405