mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix layout/uploader_layout.xml

Browse source
This commit is contained in:
Andy Scherzinger 2015-09-04 13:20:41 +02:00
parent 32145d57db
commit 7ac2a0d297
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/layout/uploader_layout.xml
View file

@ -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"