From 36d8c9f608cca5ba2f8df11008415c230825174b Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Thu, 31 Jul 2014 23:20:43 +0200
Subject: Fix merge

---
 OpenKeychain/src/main/res/layout/encrypt_content.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenKeychain/src/main/res/layout')

diff --git a/OpenKeychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml
index b2bdbf7b5..e5edc6657 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_content.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_content.xml
@@ -7,6 +7,8 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
+    <include layout="@layout/notify_area"/>
+
     <org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager
             android:id="@+id/encrypt_pager_mode"
             android:layout_width="match_parent"
-- 
cgit v1.2.3