Merge branch '1193_uploader_layout' of https://github.com/owncloud/an…

…droid into 1193_uploader_layout Conflicts: res/layout/uploader_layout.xml
owncloud · Mar 31, 2016 · a42a7cb · a42a7cb
2 parents 5676513 + ac9190d
commit a42a7cb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/res/layout/uploader_layout.xml b/res/layout/uploader_layout.xml
@@ -46,7 +46,7 @@
 	    android:layout_height="wrap_content"
 	    android:layout_alignParentBottom="true"
 	    android:orientation="horizontal"
-	    android:padding="@dimen/standard_padding">
+		android:padding="@dimen/standard_padding">
 
 		<android.support.v7.widget.AppCompatButton
 			android:theme="@style/Button"