Fix merge

2014-07-31 23:20:43 +02:00
parent eae7c711a3
commit 36d8c9f608
4 changed files with 21 additions and 37 deletions
--- 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"