resove conflit

2020-06-01 14:48:29 +06:30
parent 2e84ab17b9 a0d474a269
commit a0b6d76516
10 changed files with 967 additions and 226 deletions
--- a/assets/local/localization_en.json
+++ b/assets/local/localization_en.json
@@ -513,5 +513,10 @@

    "rate.edit.title":"EDIT RATES",

-    "rate.cal.title":"CALCULATE RATES"
+    "rate.cal.title":"CALCULATE RATES",
+
+    "package.name":"Packages",
+    "package.title":"PACKAGES",
+    "package.new":"New Package",
+    "package.edit.title":"PACKAGE"
 }