remove conflict text

2017-10-25 16:53:22 +06:30
parent 193ddc2486 fa5b544416
commit 98334531b2
137 changed files with 1952 additions and 1463 deletions
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -20,6 +20,8 @@ en:
  staff: "Staff"
  products: "Products"
  promotions: "Promotions"
+  commissions: "Commissions"
+  commissioners: "Commissioners"
  printer: "Printer"
  logout: "Logout"
  sale: "Sale"
@@ -36,7 +38,7 @@ en:
  category: "Category"
  processed: "Processed"
  competed: "Completed"
-  tax_profile: "Tad Profile"
+  tax_profile: "Tax Profile"
  payment_methods: "Payment Methods"
  accounts: "Accounts"