From a6df9d052e31f0b3b7aa614e76de9eb7a4c2f4bb Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Fri, 24 May 2019 15:05:39 +0200
Subject: [PATCH] Fix conflict in strings

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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc173ff2..8e860c65 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,13 +31,10 @@
     <string name="launch_report">Launch Report</string>
     <string name="progress">Progress</string>
     <string name="save_report">Save Report</string>
-<<<<<<< HEAD
     <string name="import_confirmation">Do you want to proceed with the file import?</string>
-=======
     <string name="update_entity" formatted="false">Update %s</string>
     <string name="comparison_chart">Comparison chart</string>
     <string name="filter_currently_selected">The filter cannot be deleted because it is currently selected.</string>
->>>>>>> 5d02ab88722ad9a85d1b7d57dac44a54369a9b74
 
     <string name="address">Address</string>
     <string name="suggestions">Naming suggestions</string>