<commit_before><?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.example.wuw037.lostandfound">

    <!-- To auto-complete the email text field in the login form with the user's emails -->
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.READ_PROFILE" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.INTERNET" />

    <application
        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
        <activity android:name=".LoginActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <activity android:name=".FoundList"></activity>
        <activity android:name=".MyPosts"></activity>
        <activity
            android:name=".Options"
            android:label="@string/title_activity_options"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".LostList"
            android:label="@string/title_activity_lost_list"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".LostForm"
            android:label="@string/title_activity_lost_form"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".FoundList"
            android:label="@string/title_activity_found_list" />
        <activity android:name=".CreateUserActivity"></activity>
    </application>

</manifest><commit_msg>More conflict resolutions<commit_after><?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.example.wuw037.lostandfound">

    <!-- To auto-complete the email text field in the login form with the user's emails -->
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.READ_PROFILE" />
    <uses-permission android:name="android.permission.READ_CONTACTS" />
    <uses-permission android:name="android.permission.INTERNET" />

    <application
        android:allowBackup="true"
        android:icon="@mipmap/ic_launcher"
        android:label="@string/app_name"
        android:roundIcon="@mipmap/ic_launcher_round"
        android:supportsRtl="true"
        android:theme="@style/AppTheme">
        <activity android:name=".LoginActivity">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        <activity android:name=".FoundList"></activity>
        <activity android:name=".MyPosts"></activity>
        <activity
            android:name=".Options"
            android:label="@string/title_activity_options"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".LostList"
            android:label="@string/title_activity_lost_list"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity
            android:name=".LostForm"
            android:label="@string/title_activity_lost_form"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity android:name=".CreateUserActivity"></activity>
    </application>

</manifest>
{'fraction_non_alphanumeric': 0.13958279680659283, 'fraction_numerical': 0.003090394025238218, 'mean_word_length': 2.963265306122449, 'pattern_counts': {'":': 0, '<': 54, '<?xml version=': 2, '>': 54, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 6}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '4143499', 'n_tokens_mistral': 1131, 'n_tokens_neox': 1045, 'n_words': 134}