Skip to content

Instantly share code, notes, and snippets.

@tophyr

tophyr/gist:4661342

Created January 29, 2013 02:56
Show Gist options
  • Save tophyr/4661342 to your computer and use it in GitHub Desktop.
Save tophyr/4661342 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
<<<<<<< HEAD
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.CAMERA" />
=======
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.CAMERA"/>
>>>>>>> develop
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment