[gpsprune] 06/07: Ooops, merge remnants

[David Paleino]

This is an automated email from the git hooks/post-receive script.

dapal pushed a commit to annotated tag debian/16.2-1
in repository gpsprune.

commit 0bc58643c0993d4b6fb0919d7d6bed9327bd3a2a
Author: David Paleino <dapal at debian.org>
Date:   Thu Jul 3 10:26:01 2014 +0200

    Ooops, merge remnants
---
 tim/prune/lang/prune-texts_hu.properties | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tim/prune/lang/prune-texts_hu.properties b/tim/prune/lang/prune-texts_hu.properties
index 0e2f0a8..58359f8 100644
--- a/tim/prune/lang/prune-texts_hu.properties
+++ b/tim/prune/lang/prune-texts_hu.properties
@@ -352,7 +352,6 @@ dialog.learnestimationparams.weight.current=jelenlegi
 dialog.learnestimationparams.weight.calculated=sz\u00e1m\u00edtott
 dialog.learnestimationparams.weight.50pc=A jelenlegi \u00e9s a sz\u00e1m\u00edtott \u00e9rt\u00e9kek \u00e1tlaga
 dialog.learnestimationparams.weight.100pccalculated=Az \u00faj sz\u00e1m\u00edtott \u00e9rt\u00e9kek haszn\u00e1lata
->>>>>>> upstream/16.2
 dialog.setmapbg.intro=V\u00e1lassza ki az egyik t\u00e9rk\u00e9pforr\u00e1st, vagy adjon hozz\u00e1 egy \u00fajat
 dialog.addmapsource.title=\u00daj t\u00e9rk\u00e9pforr\u00e1s hozz\u00e1ad\u00e1sa
 dialog.addmapsource.sourcename=Forr\u00e1s neve

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gpsprune.git