From 5f70dd3af6fcf24148613ed59e866aa67833f986 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= <romjerome@yahoo.fr>
Date: Fri, 17 May 2013 08:51:13 +0000
Subject: [PATCH] 6749: remaining one...

svn: r22339
---
 po/nl.po | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/po/nl.po b/po/nl.po
index d18bb82fc..9d4b84dec 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -12969,9 +12969,6 @@ msgstr "Het geselecteerde filter verwijderen"
 
 #: ../gramps/gui/glade/rule.glade.h:16
 msgid "Delete the selected rule"
-<<<<<<< .mine
-msgstr "De geselecteerde regel verwijderen"
-=======
 msgstr "De geselecteerde regel verwijderen"
 
 #: ../gramps/gui/glade/rule.glade.h:18