From 7ac2a0d29704b505d7a16c9e7121fb25d06af1fd Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Fri, 4 Sep 2015 13:20:41 +0200
Subject: [PATCH] fix layout/uploader_layout.xml

---
 res/layout/uploader_layout.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 9be90b84..f460bbe6 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -53,13 +53,10 @@
 	    android:orientation="horizontal" >
 
 		<android.support.v7.widget.AppCompatButton
-<<<<<<< HEAD
 		    android:id="@+id/uploader_new_folder"
 			android:theme="@style/Button"
-=======
 		    android:id="@+id/uploader_cancel"
 			style="@style/ownCloud.Button"
->>>>>>> f787213cd1cae854c169d263d3636e1de4dffa94
 		    android:layout_width="fill_parent"
 		    android:layout_height="wrap_content"
 		    android:layout_gravity="bottom"
-- 
2.11.0