fix merge conflict

deltachat · Jan 4, 2021 · aa0bbed · aa0bbed
1 parent 5fb89cd
commit aa0bbed
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/deltachat-ios/Chat/ChatViewController.swift b/deltachat-ios/Chat/ChatViewController.swift
@@ -162,15 +162,7 @@ class ChatViewController: UITableViewController {
                                        name: UIApplication.willResignActiveNotification,
                                        object: nil)
         notificationCenter.addObserver(self, selector: #selector(keyboardWillShow(_:)), name: UIResponder.keyboardWillShowNotification, object: nil)
-<<<<<<< HEAD
         prepareContextMenu()
-=======
-        notificationCenter.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
-        notificationCenter.addObserver(self, selector: #selector(keyboardDidShow(_:)), name: UIResponder.keyboardDidShowNotification, object: nil)
-    }
->>>>>>> manually re-integrated branch due to merge conflicts
-
-
     }
 
     @objc func keyboardWillShow(_ notification: Notification) {