Skip to content

Resolve old merge conflict #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivarveen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Resolve old merge conflict #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions MTI RFID ME GUI/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -30,4 +26,4 @@
</activity>

</application>
</manifest>
</manifest>
4 changes: 0 additions & 4 deletions MTI RFID ME GUI/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down