issue project-travel-mate#705 Added conflict changes

AminullahTajMuhammad · Nov 12, 2019 · 8a9a364 · 8a9a364
1 parent 8d27796
commit 8a9a364
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/Android/app/src/main/res/values/strings.xml b/Android/app/src/main/res/values/strings.xml
@@ -384,6 +384,7 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="add_widget">Add World Clock Widget</string>
     <string name="configure">Select Timezone For Clock Widget</string>
+    <string name="toast_no_internet_detected">We couldn\'t find an active internet connection. Please try again.</string>
   <string name="trip_name_label">Trip Name:</string>
   <string name="label_trip_date">Trip Date:</string>
 </resources>