From c1cdea42b6261008596d6924dcc488aef289b0d2 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Tue, 22 Aug 2017 23:09:55 -0500
Subject: Finish first pass of config editor fields

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/src/main/res/layout/config_activity.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/src/main/res/layout/config_activity.xml')

diff --git a/app/src/main/res/layout/config_activity.xml b/app/src/main/res/layout/config_activity.xml
index d67e64bc..0f21e2e8 100644
--- a/app/src/main/res/layout/config_activity.xml
+++ b/app/src/main/res/layout/config_activity.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/master_fragment"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    tools:ignore="MergeRootFrame" />
-- 
cgit v1.2.3