mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 17:31:11 +02:00
deutsch.locale: fix merge error leftovers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21bc82c001
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-28 (Thu, 28 Dec 2017)
Origin message was:
------------------
- deutsch.locale: fix merge error leftovers
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -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
|
||||
|
Reference in New Issue
Block a user