no message

src/i18n/en/common.json

@@ -17,8 +17,8 @@
     "Yes": "Yes",
     "No": "No",
     "Equipment Name": "Equipment Name",
-    "Equipment Code": "Equipment Code"
-=======
+    "Equipment Code": "Equipment Code",
+
     "ShopAndTruck": "ShopAndTruck"
->>>>>>> Stashed changes
+
 }