From cc99cb6a2b293368e089c0c1423df2f93ee6a693 Mon Sep 17 00:00:00 2001
From: Tim Bentley <tim.bentley@gmail.com>
Date: Sun, 10 Jan 2016 19:33:46 +0000
Subject: [PATCH] fix merge issues

---
 .../main/res/layout/blank_display_dialog.xml  | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/blank_display_dialog.xml b/app/src/main/res/layout/blank_display_dialog.xml
index 51c5bae..a7f7397 100644
--- a/app/src/main/res/layout/blank_display_dialog.xml
+++ b/app/src/main/res/layout/blank_display_dialog.xml
@@ -7,7 +7,7 @@
               android:layout_height="fill_parent"
               android:weightSum="1">
     <TextView
-            android:layout_width="315dp"
+            android:layout_width="314dp"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/display_blank_summary"
@@ -15,18 +15,18 @@
             android:textStyle="bold|italic"
             android:textSize="40px"
             android:height="70px"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
+        android:layout_marginTop="10dp"
+        android:layout_marginBottom="10dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/display_reset"
             android:id="@+id/buttonReset"
             android:textSize="20sp"
-            android:height="30dp"
+            android:height="40dp"
             android:clickable="true"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"/>
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -35,8 +35,8 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"/>
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -45,8 +45,8 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"/>
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
     <RadioButton
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,6 +55,6 @@
             android:textSize="20sp"
             android:height="40dp"
             android:clickable="true"
-            android:layout_marginTop="20dp"
-            android:layout_marginBottom="20dp"/>
+        android:layout_marginTop="20dp"
+        android:layout_marginBottom="20dp" />
 </LinearLayout>
\ No newline at end of file