taler-merchant-demos

commit eebcb0164afb1c09af22033edc3f8cf246e4cafe
parent 985fd13ad3b848521e07c22c2387638d10f8a111
Author: Stefan Kügel <skuegel@web.de>
Date:   Sat, 22 May 2021 21:12:46 +0200

Get rid of merge artifacts in the Chinese message.po file

Diffstat:
M
translations/zh_Hant/LC_MESSAGES/messages.po
 | 
3
---

1 file changed, 0 insertions(+), 3 deletions(-)
diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po b/translations/zh_Hant/LC_MESSAGES/messages.po
@@ -8,11 +8,8 @@ msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: eintritt@hotmail.com\n"
 "POT-Creation-Date: 2021-03-12 18:42+0100\n"
-<<<<<<< HEAD
 "PO-Revision-Date: 2021-05-20 20:47+0000\n"
-=======
 "PO-Revision-Date: 2021-05-16 06:58+0000\n"
->>>>>>> a5bedb7db9ceaa0342306f12f900914a8e9b4155
 "Last-Translator: Ting-Yi Fu <futingyi0215@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <http://weblate.taler.net/projects/"
 "gnu-taler/demonstration-pages/zh_Hant/>\n"