Merge branch 'trz/rebase' into trz/rename

1 files changed, 0 insertions, 4 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
index 20eca48a..dda4208c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
@@ -133,10 +133,6 @@ public class ConversationsPlusPreferences extends Settings {
         return getString("notification_ringtone", null);
     }
 
-    public static boolean alwaysNotifyInConference() {
-        return getBoolean("always_notify_in_conference", false);
-    }
-
     public static boolean showNotification() {
         return getBoolean("show_notification", true);
     }