Fixing conflicts

feature/top10
Laurent 7 years ago
parent 40548e96e9
commit 8bcfdc8356
  1. 5
      app/src/main/res/values/strings.xml

@ -11,11 +11,6 @@
<string name="initial_value">Initial Value</string>
<string name="less_then_2_values_for_display">Can\'t show because there is less than two values to display!</string>
<string name="invalid_object">The object you\'re trying to access is invalid</string>
<<<<<<< HEAD
<!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>-->
=======
>>>>>>> dev
<string name="address">Address</string>
<string name="suggestions">Naming suggestions</string>

Loading…
Cancel
Save