summaryrefslogtreecommitdiff
path: root/translations/zh_Hant/LC_MESSAGES/messages.po
diff options
context:
space:
mode:
Diffstat (limited to 'translations/zh_Hant/LC_MESSAGES/messages.po')
-rw-r--r--translations/zh_Hant/LC_MESSAGES/messages.po3
1 files changed, 0 insertions, 3 deletions
diff --git a/translations/zh_Hant/LC_MESSAGES/messages.po b/translations/zh_Hant/LC_MESSAGES/messages.po
index a09390d..765aea5 100644
--- 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"