From 6e66359979a1d19868764e4ba4205542512745bc Mon Sep 17 00:00:00 2001
From: Ivar in 't Veen <ivarveen@gmail.com>
Date: Sat, 3 Oct 2015 16:09:35 +0200
Subject: [PATCH] Resolve old merge conflict

---
 MTI RFID ME GUI/AndroidManifest.xml    | 6 +-----
 MTI RFID ME GUI/res/values/strings.xml | 4 ----
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/MTI RFID ME GUI/AndroidManifest.xml b/MTI RFID ME GUI/AndroidManifest.xml
index 651fb2b..1581f37 100644
--- a/MTI RFID ME GUI/AndroidManifest.xml	
+++ b/MTI RFID ME GUI/AndroidManifest.xml	
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.mti.rfid.minime"
-<<<<<<< HEAD:MTI RFID ME GUI/AndroidManifest.xml
-      android:versionCode="9"
-=======
       android:versionCode="10"
->>>>>>> v1.5.1 release:MTI RFID ME GUI/AndroidManifest.xml
       android:versionName="@string/about_sw_ver_sum" android:installLocation="auto">
     <uses-sdk android:minSdkVersion="13" />
     <uses-feature android:name="android.hardware.usb.host"></uses-feature>
@@ -30,4 +26,4 @@
         </activity>
 
     </application>
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/MTI RFID ME GUI/res/values/strings.xml b/MTI RFID ME GUI/res/values/strings.xml
index 2b9ec3c..3ceb37b 100644
--- a/MTI RFID ME GUI/res/values/strings.xml	
+++ b/MTI RFID ME GUI/res/values/strings.xml	
@@ -59,11 +59,7 @@
     <string name="about_web">Web Site</string>
     <string name="about_web_sum">http://www.mti.com.tw</string>
     <string name="about_sw_ver">Software Version</string>
-<<<<<<< HEAD:MTI RFID ME GUI/res/values/strings.xml
-    <string name="about_sw_ver_sum">1.5.0</string>
-=======
     <string name="about_sw_ver_sum">1.5.1</string>
->>>>>>> v1.5.1 release:MTI RFID ME GUI/res/values/strings.xml
     <string name="cfg_inventory_times">Scan Times</string>
     <string name="nxp_trigger">Trigger</string>
     <string name="cfg_misc">Miscellaneous</string>