From 0265bd05bf7ef6ee14c85ae87831bcc42a4b02cd Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Mon, 5 Oct 2015 16:27:08 +0200
Subject: fix imports and namespaces

---
 src/main/AndroidManifest.xml                                            | 2 +-
 .../de/thedevstack/conversationsplus/ConversationsPlusApplication.java  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 9da8a4ea..ad5d31e9 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         android:label="@string/app_name"
         android:theme="@style/ConversationsTheme"
         tools:replace="android:label"
-        android:name=".ConversationsPlusApplication">
+        android:name="de.thedevstack.conversationsplus.ConversationsPlusApplication">
         <service android:name=".services.XmppConnectionService" />
 
         <receiver android:name=".services.EventReceiver" >
diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
index dfe67cb7..2def66f7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
@@ -6,6 +6,8 @@ import android.content.pm.PackageManager;
 
 import java.io.File;
 
+import eu.siacs.conversations.R;
+
 /**
  * This class is used to provide static access to the applicationcontext.
  */
-- 
cgit v1.2.3