fix

src/i18n/zh/do.json

@@ -41,11 +41,7 @@
     "Delete": "刪除",
     "Release": "放單",
     "Back": "返回",
-<<<<<<< HEAD
     "Batch Release": "批量放單",
-    "Batch release completed successfully.": "已完成批量放單"
-
-=======
+    "Batch release completed successfully.": "已完成批量放單",
     "Edit Delivery Order Detail": "編輯交貨單詳情"
->>>>>>> 99400f68e2291628aae3d93b1a901a41ff80c570
 }