search

anshulkhattar / Beginner-Level-Android-Studio-Apps

A repository for Hacktoberfest conducted by Digital Ocean. Star the repository if you find it interesting.
GNU General Public License v3.0
102 stars 148 forks source link

resolve merge conflicts in AndroidManifest #82

Closed Florence-Njeri closed 5 years ago

Florence-Njeri commented 5 years ago

There were merge conflicts when I cloned the repo 


<<<<<<< HEAD
        <activity android:name=".activity.BuatEventActivity" />
        <activity
            android:name=".tenant.MainTenantActivity"
            android:label="@string/title_activity_main_tenant"
            android:theme="@style/AppTheme.NoActionBar" />
        <activity android:name=".tenant.TambahProdukActivity" />
        <activity android:name=".tenant.TambahGalleryActivity" />
        <activity android:name=".tenant.TambahFasilitasActivity" />
        <activity android:name=".tenant.PengaduanTenantActivity" />
        <activity android:name=".tenant.ReviewTenantActivity" />
        <activity android:name=".tenant.EventTenantActivity" />
        <activity android:name=".tenant.TambahEventActivity" />
        <activity android:name=".tenant.ProdukTenantActivity" />
        <activity android:name=".tenant.GalleryTenantActivity" />
        <activity android:name=".tenant.FasilitasTenantActivity" />
        <activity android:name=".activity.DetailGalleryActivity"
            android:theme="@style/AppTheme.NoActionBar"></activity>
=======
        <activity android:name=".activity.BuatEventActivity"></activity>
>>>>>>> dfdb3d667b3e9a706f923bbb336de0a7f7ed64e9```
anshulkhattar commented 5 years ago

There are still some conflicts , so I'm unable to merge your pull request, kindly look into it. For now , I'm closing this pull request.