merge cleanup

ml-archive · May 3, 2019 · 650ec0e · 650ec0e
1 parent bf79dbd
commit 650ec0e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/ReachabilityUI/ReachabilityUIDemo/Scenes/TabBar/TabBarCoordinator.swift b/ReachabilityUI/ReachabilityUIDemo/Scenes/TabBar/TabBarCoordinator.swift
@@ -56,10 +56,6 @@ class TabBarCoordinator: Coordinator {
         let configuration = ReachabilityConfiguration(title: "Connected",
                                                       noConnectionTitle: "No Connection",
                                                       options: nil)
-<<<<<<< HEAD:ReachabilityUIDemo/ReachabilityUIDemo/Scenes/TabBar/TabBarCoordinator.swift
-
-=======
->>>>>>> makes ReachabilityUIDemo a part of the main project:ReachabilityUI/ReachabilityUIDemo/Scenes/TabBar/TabBarCoordinator.swift
         let coordinator = ReachabilityCoordinator(window: window,
                                                   reachabilityListenerFactory: dependencies.reachabilityListenerFactory,
                                                   configuration: configuration)