fixed merge conflicts

openMF · Mar 7, 2020 · 1e595d9 · 1e595d9
2 parents 398c6dd + fa70982
commit 1e595d9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/mifosng-android/src/main/res/values/strings.xml b/mifosng-android/src/main/res/values/strings.xml
@@ -793,6 +793,11 @@
     <string name="office_head">office</string>
     <string name="status_head">status</string>
     <string name="client_search_hint"></string>
+    <string name="Image_Upload_Successful">Image Upload Successful</string>
+    <string name="Image_Upload_Failed">Image Upload Failed</string>
+    <string name="upload_photo">Upload Photo</string>
+    <string name="take_a_photo">Take a Photo</string>
+    <string name="remove_existing_photo">Remove Existing Photo</string>
 
     <string name="create_client_loading_message">Creating new client</string>
     <string name="savings_account_loading_message">Activating savings account</string>