summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/lang/english.lang3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 5bce7f4..851c475 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12344,5 +12344,4 @@
*: none
quickscreen: "Set as Bottom Quickscreen Item"
</voice>
-</phrase>
->>>>>>> .r19041
+</phrase> \ No newline at end of file