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

6749: conflicts on header

Browse Source 
svn: r22337
This commit is contained in:
Jérôme Rapinat 2013-05-17 08:47:34 +00:00
parent e577b1569d
commit 4b69296158
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
po/nl.po
View File

@ -40,17 +40,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gramps\n" "Project-Id-Version: gramps\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
<<<<<<< .mine
"POT-Creation-Date: 2013-05-14 10:10+0200\n" "POT-Creation-Date: 2013-05-14 10:10+0200\n"
<<<<<<< .mine
"PO-Revision-Date: 2013-05-14 23:08+0100\n" "PO-Revision-Date: 2013-05-14 23:08+0100\n"
=======
"PO-Revision-Date: 2013-05-14 23:08+0100\n"
=======
"POT-Creation-Date: 2013-05-14 10:10+0200\n"
"PO-Revision-Date: 2013-05-14 14:00+0100\n"
>>>>>>> .r22329
>>>>>>> .r22314
"Last-Translator: Harmen Huizinga\n" "Last-Translator: Harmen Huizinga\n"
"Language-Team: nederlands <frederik.de.richter@gmail.com>\n" "Language-Team: nederlands <frederik.de.richter@gmail.com>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"