From 5176333e4b29b8e693af5cf721224540cf6c4b19 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 28 Dec 2017 21:48:20 +0100 Subject: [PATCH] deutsch.locale: fix merge error leftovers Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/21bc82c001e8451f1f63b3b18bec43b9473f1f2a Author: vanhofen Date: 2017-12-28 (Thu, 28 Dec 2017) Origin message was: ------------------ - deutsch.locale: fix merge error leftovers --- data/locale/deutsch.locale | 1 - 1 file changed, 1 deletion(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index 3d235f725..2482fa53b 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -417,7 +417,6 @@ daemon_item.ushare_desc A/V und DLNA Medienserver daemon_item.ushare_name uShare daemon_item.xupnpd_desc eXtensible UPnP agent - DLNA Medienserver für IPTV daemon_item.xupnpd_name xupnpd ->>>>>>> date.Apr Apr date.Aug Aug date.Dec Dez