From 479887eb84b5c41a442c0fcd272e5b000e3f38ec Mon Sep 17 00:00:00 2001
From: BO41 <lukasw41@gmail.com>
Date: Tue, 11 Sep 2018 19:37:12 +0200
Subject: [PATCH] fix broken merge resolve

fixing merge conflicts broke build
---
 .../main/res/layout/fragment_choose_tabs.xml  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 app/src/main/res/layout/fragment_choose_tabs.xml

diff --git a/app/src/main/res/layout/fragment_choose_tabs.xml b/app/src/main/res/layout/fragment_choose_tabs.xml
new file mode 100644
index 000000000..0097a409a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_choose_tabs.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/selectedTabs"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/list_choose_tabs"/>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/addTabsButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginRight="16dp"
+        android:clickable="true"
+        android:focusable="true"
+        app:backgroundTint="?attr/colorPrimary"
+        app:fabSize="auto"
+        app:srcCompat="?attr/ic_add"/>
+
+</RelativeLayout>
\ No newline at end of file