gistfile1.xml

<?xml version="1.0" encoding="utf-8"?>
<<<<<<< Original


<?xml version="1.0" encoding="utf-8"?>
<<<<<<< Original






<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="pi.shade.mobileapp"
    android:versionCode="1"
    android:versionName="1.0" >

    <uses-sdk
        android:minSdkVersion="17"
        android:targetSdkVersion="17" />

    <application
        android:allowBackup="true"
        android:icon="@drawable/ic_launcher"
        android:label="@string/app_name"
        android:theme="@style/Holo" >
        <activity
            android:name="pi.shade.mobileapp.MainActivity"
            android:label="@string/app_name" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <activity
            android:name="pi.shade.mobileapp.ListPackages"
            android:label="@string/title_activity_list_packages"
            android:parentActivityName="pi.shade.mobileapp.MainActivity" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="pi.shade.mobileapp.MainActivity" />
        </activity>
        <activity
            android:name="pi.shade.mobileapp.ListUpdater"
            android:label="@string/title_activity_list_updater"
            android:parentActivityName="pi.shade.mobileapp.ListPackages" >
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="pi.shade.mobileapp.ListPackages" />
        </activity>
    </application>

</manifest>=======






<manifest xmlns:android="http://schemas.android.com/apk/res/android" >

    <application>
        <activity
            android:name="pi.shade.mobileapp.ListPackages"
            android:label="@string/title_activity_list_packages" >
        </activity>
    </application>

</manifest>>>>>>>> Added





=======


<manifest xmlns:android="http://schemas.android.com/apk/res/android" >

    <application>
        <activity
            android:name="pi.shade.mobileapp.ListPackages"
            android:label="@string/title_activity_list_packages" >
        </activity>
    </application>

</manifest>>>>>>>> Added