From 037c73ba7f7cddf3041960a6ce451af170cb8b7a Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Mon, 29 Apr 2019 14:17:51 +0200
Subject: [PATCH] Fixing strings conflicts

---
 app/src/main/res/values/strings.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9b5f049f..73666f07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,14 +10,8 @@
     <string name="lines">Lines</string>
     <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>
-<<<<<<< HEAD
-    <!--<string name="session_missing_end_date">Please set the end date for the session</string>-->
-=======
     <string name="invalid_object">The object you\'re trying to access is invalid</string>
 
->>>>>>> 94f412c... Improving labels
-    <!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>-->
-
     <string name="address">Address</string>
     <string name="suggestions">Naming suggestions</string>
     <string name="data_deleted" formatted="false">%s deleted</string>