Skip to content

Y
Your Cashier
Commit 7629187c authored by Ahmad Abi Mulya's avatar Ahmad Abi Mulya
Browse files
Options

fix conflict merging

parent 2398384d
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 13 deletions
app/build.gradle
View file @ 7629187c
......@@ -56,8 +56,6 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
<<<<<<< HEAD
=======
>>>>>>> dev-5
}
\ No newline at end of file
}
\ No newline at end of file
app/src/main/AndroidManifest.xml
View file @ 7629187c
......@@ -36,13 +36,6 @@
<activity
android:name=".activities.CartActivity"
android:theme="@style/AppTheme2" />
<<<<<<< HEAD
<activity android:name=".activities.MainActivity" android:theme="@style/AppTheme2"/>
<activity android:name=".activities.ProductActivity" android:theme="@style/AppTheme2">
</activity>
<activity android:name=".activities.LoginActivity"/>
=======
<activity
android:name=".activities.MainActivity"
android:theme="@style/AppTheme2" />
......@@ -50,8 +43,6 @@
android:name=".activities.ProductActivity"
android:theme="@style/AppTheme2" />
<activity android:name=".activities.LoginActivity" />
>>>>>>> dev-5
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.example.yourcashiertest.fileprovider"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment