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

fix merge debris

parent 9dd57227
......@@ -26,12 +26,9 @@ class ScannerTableViewController: UITableViewController {
}
override func viewWillAppear(_ animated: Bool) {
self.tabBarController?.tabBar.tintColor = UIColor.init(named: "camp_color")
super.viewWillAppear(animated)
}
self.tabBarController?.tabBar.tintColor = UIColor.init(named: "camp_color")
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
BluetoothManager.sharedInstance().startScan()
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