fix merge debris

card10badge/Scanner/ScannerTableViewController.swift

@@ -24,14 +24,11 @@ class ScannerTableViewController: UITableViewController {
         
         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) {
         super.viewWillAppear(animated)
+        self.tabBarController?.tabBar.tintColor = UIColor.init(named: "camp_color")
+
         BluetoothManager.sharedInstance().startScan()
         updateScanButtonState()
     }