From f282b868d6f72afc81ba74e3d02e75e33d102bba Mon Sep 17 00:00:00 2001 From: gambas Date: Thu, 11 Apr 2019 12:20:20 +0200 Subject: [PATCH] Fix Dutch translation file which had conflict markers inside. [GB.TERM.FORM] * BUG: Fix Dutch translation file which had conflict markers inside. --- comp/src/gb.term.form/.lang/nl.po | 4 ---- 1 file changed, 4 deletions(-) diff --git a/comp/src/gb.term.form/.lang/nl.po b/comp/src/gb.term.form/.lang/nl.po index 7b691bb2a..c59b05862 100644 --- a/comp/src/gb.term.form/.lang/nl.po +++ b/comp/src/gb.term.form/.lang/nl.po @@ -1,8 +1,4 @@ -<<<<<<< HEAD -#Willy Raets < gbWilly@openmailbox.org >, 2017 -======= # Willy Raets < gbWilly@openmailbox.org >, 2017 ->>>>>>> a247c14d24b8edc4533cba6bf1b9240a4bf1463a #, fuzzy msgid "" msgstr ""