aboutsummaryrefslogtreecommitdiffstats
path: root/app/src
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2015-03-27 11:54:38 +0000
committerKenny Root <kenny@the-b.org>2015-03-27 11:54:38 +0000
commitd05cbcb369f0d0f6be587789f7b5925a7f51553a (patch)
treef37a45e7cf8b0b252f2d44a69db8f6f453293e37 /app/src
parent48e9c2f37ca757c3dfbd882417670ed67192725f (diff)
parentc6bbfe5aecc43ef551c395d748d47021ae2530e8 (diff)
downloadconnectbot-d05cbcb369f0d0f6be587789f7b5925a7f51553a.tar.gz
connectbot-d05cbcb369f0d0f6be587789f7b5925a7f51553a.tar.bz2
connectbot-d05cbcb369f0d0f6be587789f7b5925a7f51553a.zip
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/res/layout/act_colors.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/src/main/res/layout/act_colors.xml b/app/src/main/res/layout/act_colors.xml
index dfb6082..3bda649 100644
--- a/app/src/main/res/layout/act_colors.xml
+++ b/app/src/main/res/layout/act_colors.xml
@@ -46,7 +46,6 @@
android:layout_alignTop="@id/fg"
android:layout_alignParentRight="true"
android:layout_toRightOf="@id/fg"
- android:layout_alignParentStart="true"
android:minHeight="60dp"
android:layout_weight="1"
android:gravity="center"