From ebde7dc0dab7c4727587db1f143e267824fb97d3 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 1 May 2018 20:45:29 +0200
Subject: [PATCH] Fixes a linting issue

Signed-off-by: Janne Koschinski <janne@kuschku.de>
---
 app/src/main/res/layout/layout_history.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/layout_history.xml b/app/src/main/res/layout/layout_history.xml
index 61e6e5817..80c211dfc 100644
--- a/app/src/main/res/layout/layout_history.xml
+++ b/app/src/main/res/layout/layout_history.xml
@@ -25,7 +25,8 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:id="@+id/card_panel"
   android:layout_width="match_parent"
-  android:layout_height="match_parent">
+  android:layout_height="match_parent"
+  tools:ignore="MergeRootFrame">
 
   <android.support.v7.widget.CardView
     style="?attr/cardStyle"
-- 
GitLab