Commit 1b10072c authored by Thomas Mellenthin's avatar Thomas Mellenthin

fix merge debris

parent 9dd57227
...@@ -24,14 +24,11 @@ class ScannerTableViewController: UITableViewController { ...@@ -24,14 +24,11 @@ class ScannerTableViewController: UITableViewController {
self.tabBarItem = UITabBarItem.init(title: "Scan", image: UIImage(named: "fd_camp"), selectedImage: nil) self.tabBarItem = UITabBarItem.init(title: "Scan", image: UIImage(named: "fd_camp"), selectedImage: nil)
} }
override func viewWillAppear(_ animated: Bool) {
self.tabBarController?.tabBar.tintColor = UIColor.init(named: "camp_color")
super.viewWillAppear(animated)
}
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
self.tabBarController?.tabBar.tintColor = UIColor.init(named: "camp_color")
BluetoothManager.sharedInstance().startScan() BluetoothManager.sharedInstance().startScan()
updateScanButtonState() updateScanButtonState()
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment