From 076beb57e331c76aebba9bc735b57af3a5484ce0 Mon Sep 17 00:00:00 2001
From: Christian S <christian@pix-art.de>
Date: Thu, 23 Jul 2015 12:12:56 +0200
Subject: corrected language file

---
 src/main/res/values-zh-rCN/strings.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/main/res')

diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 528afed72..95110d034 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -288,11 +288,8 @@
   <string name="conference_members_only">此讨论组只允许成员加入</string>
   <string name="conference_kicked">你被从此讨论组踢出</string>
   <string name="using_account">用账户  %s</string>
-<<<<<<< HEAD
   <string name="checking_file">正在 HTTP 托管中检查图片</string>
   <string name="image_file_deleted">此图片已经被删除</string>
-=======
->>>>>>> 4f62793a67415e91f589924b70fdd5bdd35c284d
   <string name="not_connected_try_again">你没有连接。请稍后重试</string>
   <string name="message_options">消息选项</string>
   <string name="copy_text">拷贝文本</string>
-- 
cgit v1.2.3