luci-app-statistics: fix translation

Fix one item forgoteen in the previous fix/merge commit.

Signed-off-by: Hannu Nyman <redacted>

diff --git a/applications/luci-app-statistics/po/zh_Hant/statistics.po b/applications/luci-app-statistics/po/zh_Hant/statistics.po
index 0bbe87cb67456d549ee6a92d640648024898f852..af1f20b9d245e9c0d8e42434b7d6a085777d8e98 100644 (file)
--- a/applications/luci-app-statistics/po/zh_Hant/statistics.po
+++ b/applications/luci-app-statistics/po/zh_Hant/statistics.po
@@ -1681,13 +1681,8 @@ msgid ""
 "read from /sys/class/thermal/*/temp ( '*' denotes the thermal device to be "
 "read, e.g. thermal_zone1 )"
 msgstr ""
-<<<<<<< HEAD
-"溫感外掛程式將會監測系統溫度。資料主要取自 /sys/class/thermal/*/temp ('*' 表"
-"示溫感裝置的名稱，例如: thermal_zone1)"
-=======
 "溫感外掛將會監測系統溫度。資料主要取自 /sys/class/thermal/*/temp ('*' 表示溫"
 "感裝置的名稱，例如: thermal_zone1)"
->>>>>>> weblate/master
 
 #: applications/luci-app-statistics/htdocs/luci-static/resources/view/statistics/plugins/unixsock.js:8
 msgid ""