Fixed merge conflict in AndroidManifest.xml

gameplay/android/AndroidManifest.xml

@@ -1,20 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<<<<<<< HEAD
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-        package="org.gameplay3d.gameplay"
-        android:versionCode="1"
-        android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="15" />
-=======
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
 	package="org.gameplay3d.gameplay" 
 	android:versionCode="1" 
 	android:versionName="1.0">
 
     <uses-sdk android:minSdkVersion="15”/>
->>>>>>> 442f995770ee3a2089b71c2d54cc0732f0ec70cf
 
     <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" />
 
-</manifest>
+</manifest>