From 7629e00f3369df0a73bd7230800b0eebf4ca35bd Mon Sep 17 00:00:00 2001
From: Dinu Kumarasiri <sandarumk@gmail.com>
Date: Sat, 20 May 2017 12:28:39 +0200
Subject: [PATCH] Fix merge conflicts

---
 app/src/main/res/layout/activity_about.xml     | 9 ---------
 app/src/main/res/layout/activity_share.xml     | 8 +-------
 app/src/main/res/layout/layout_upload_item.xml | 3 ---
 app/src/main/res/values/strings.xml            | 8 --------
 4 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index f0415c55d..bb053e860 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -4,18 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-<<<<<<< HEAD
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
-=======
-    <ImageView
-        android:src="@drawable/ic_launcher"
-        android:layout_height="wrap_content"
-        android:layout_width="wrap_content"
-        android:contentDescription= "@string/commons_logo"
-        />
->>>>>>> origin/fix_lint_issues
 
         <include
             android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index a70accc91..d2fd9ee74 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -7,14 +7,8 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-<<<<<<< HEAD
         android:layout_height="match_parent">
-=======
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:contentDescription="@string/background_image"
-        />
->>>>>>> origin/fix_lint_issues
+
 
         <include
             android:id="@+id/toolbar"
diff --git a/app/src/main/res/layout/layout_upload_item.xml b/app/src/main/res/layout/layout_upload_item.xml
index 6c9478121..ff452d7d2 100644
--- a/app/src/main/res/layout/layout_upload_item.xml
+++ b/app/src/main/res/layout/layout_upload_item.xml
@@ -13,13 +13,10 @@
         android:id="@+id/uploadImage"
         android:layout_width="match_parent"
         android:layout_height="192dp"
-<<<<<<< HEAD
         app:actualImageScaleType="centerCrop"
         app:placeholderImage="@drawable/ic_image_black_24dp"
         app:failureImage="@drawable/ic_error_outline_black_24dp"
-=======
         android:scaleType="centerCrop"
->>>>>>> origin/fix_lint_issues
         android:contentDescription="@string/upload_image"
         />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0c8c5368c..06437b12e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -183,10 +183,7 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="maximum_limit_alert">Unable to display more than 500</string>
   <string name="set_limit">Set Recent Upload Limit</string>
   <string name="login_failed_2fa_not_supported">Two factor authentication is currently not supported.</string>
-<<<<<<< HEAD
   <string name="logout_verification">Do you really want to logout?</string>
-=======
->>>>>>> origin/fix_lint_issues
   <string name="commons_logo">Commons Logo</string>
   <string name="background_image">Background Image</string>
   <string name="mediaimage_failed">Media Image Failed</string>
@@ -201,11 +198,6 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="welcome_image_welcome_wikipedia">Welcome Wikipedia</string>
   <string name="welcome_image_welcome_copyright">Welcome Copyright</string>
   <string name="welcome_image_sydney_opera_house">Sydney Opera House</string>
-<<<<<<< HEAD
->>>>>>> [Lint] Add content description to image views
-=======
->>>>>>> origin/fix_lint_issues
-
   <string name="cancel">Cancel</string>
   <string name="navigation_drawer_open">Open</string>
   <string name="navigation_drawer_close">Close</string>