From 1b10072cbbaf8635fe5ff256fbd350aef3bfd345 Mon Sep 17 00:00:00 2001
From: Thomas Mellenthin <thomas.mellenthin@teufel.de>
Date: Mon, 19 Aug 2019 15:27:36 +0200
Subject: [PATCH] fix merge debris

---
 card10badge/Scanner/ScannerTableViewController.swift | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/card10badge/Scanner/ScannerTableViewController.swift b/card10badge/Scanner/ScannerTableViewController.swift
index 087200a..21f18db 100644
--- a/card10badge/Scanner/ScannerTableViewController.swift
+++ b/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()
     }
-- 
GitLab