reemvoed conflict tags

litecoin-foundation · Apr 9, 2023 · 94403b2 · 94403b2
1 parent 1db58ca
commit 94403b2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/loafwallet/src/Strings/zh-Hant.lproj/Localizable.strings b/loafwallet/src/Strings/zh-Hant.lproj/Localizable.strings
@@ -972,12 +972,9 @@
 
 /* Enter domain */
 "Send.UnstoppableDomains.simpleplaceholder" = "輸入域";
-<<<<<<< HEAD
-=======
 
 /* UDSystemError */
 "Send.UnstoppableDomains.udSystemError" = "系統查找問題。 [錯誤: %2$d]";
->>>>>>> 8f58eee3 (🥳[Techdebt] relayout address view controller (#120))
 
 /* UDSystemError */
 "Send.UnstoppableDomains.udSystemError" = "系統查找問題。 [錯誤：%2$d]";