Sharvaniharan has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374821 )
Change subject: Merge branch 'master' into dark_mode_card_colors
......................................................................
Merge branch 'master' into dark_mode_card_colors
Change-Id: I7633ad4dca8b061ba9dd2b3f941cc5650b3b12ca
---
M app/src/main/res/layout/view_card_onboarding.xml
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/21/374821/1
diff --git a/app/src/main/res/layout/view_card_onboarding.xml
b/app/src/main/res/layout/view_card_onboarding.xml
index 18ce025..fd15cd0 100644
--- a/app/src/main/res/layout/view_card_onboarding.xml
+++ b/app/src/main/res/layout/view_card_onboarding.xml
@@ -1,4 +1,3 @@
-<<<<<<< HEAD (0a0f8f Dark Mode : Change card colors for dark mode)
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android";
@@ -58,6 +57,4 @@
android:textColor="?attr/feed_text_tertiary_color"
tools:text="Lorem ipsum"/>
-</LinearLayout>
-=======
->>>>>>> BRANCH (03bce0 Merge "Bump versionCode")
+</LinearLayout>
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/374821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7633ad4dca8b061ba9dd2b3f941cc5650b3b12ca
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Sharvaniharan <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
