AndroidManifest.xml.orig

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.intalker.borrow"
    android:versionCode="1"
    android:versionName="1.0" >
<<<<<<< HEAD

    <uses-permission android:name="android.permission.INTERNET"/>
	<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="15"/>
=======
    
	<uses-permission android:name="android.permission.INTERNET"></uses-permission>
	
    <uses-sdk
        android:minSdkVersion="8"
        android:targetSdkVersion="15" />
>>>>>>> 266767c17a2929e2477bb50663dc39df312b76a1

    <application
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/AppTheme" >
        <activity
            android:name=".HomeActivity"
            android:configChanges="orientation|keyboardHidden"
            android:label="@string/title_activity_home" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
<<<<<<< HEAD
        <activity
            android:name="com.tencent.tauth.TAuthView"
            android:configChanges="keyboardHidden|navigation|orientation"
            android:launchMode="singleTask" >
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
                <data android:scheme="auth" />
            </intent-filter>
        </activity>
=======
        
        <activity android:name="com.tencent.tauth.TAuthView" 
            android:launchMode="singleTask" 
            android:configChanges="keyboardHidden|navigation|orientation">
		    <intent-filter>  
		        <action android:name="android.intent.action.VIEW" />  
		        <category android:name="android.intent.category.DEFAULT" />
		        <category android:name="android.intent.category.BROWSABLE" />
		        <data android:scheme="auth"/>  		
		    </intent-filter>  
		</activity>
>>>>>>> 266767c17a2929e2477bb50663dc39df312b76a1
    </application>

</manifest>