X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/32145d57dbbdde6163664ddfcd8c28b10b134503..9064e6066c1d7a801ab206e83d06f2cd141ce257:/res/layout/uploader_layout.xml

diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
index 9be90b84..9d95ee4f 100644
--- a/res/layout/uploader_layout.xml
+++ b/res/layout/uploader_layout.xml
@@ -53,13 +53,9 @@
 	    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"