removed accidental 'git merge' command from manifest

This commit is contained in:
Adam Howard 2015-12-17 18:01:24 +00:00
parent 95d3651e29
commit 3e94d18fe1

View file

@ -2,7 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.schabi.newpipe" >
git merge
<uses-permission android:name= "android.permission.INTERNET" />
<uses-permission android:name= "android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>