Merge branch 'master' of github.com:Electrode-iOS/ELRouter into carthage

# Conflicts: # ELRouter/Router.swift
Electrode-iOS · Dec 30, 2016 · 27a8f8c · 27a8f8c
2 parents 8c29810 + 19c2ecc
commit 27a8f8c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ELRouterTests/RouteTests.swift b/ELRouterTests/RouteTests.swift
@@ -190,7 +190,7 @@ extension RouteTests {
         let router = Router()
         let navigator = MockNavigator()
         router.navigator = navigator
-        let route = Route("executeTest", type:  .Push) { variable, _ in
+        let route = Route("executeTest", type:  .push) { variable, _ in
             let vc = UIViewController(nibName: nil, bundle: nil)
             vc.title = "Push Test"
             return vc
@@ -208,7 +208,7 @@ extension RouteTests {
 //        let router = Router()
 //        let navigator = MockNavigator()
 //        router.navigator = navigator
-//        let route = Route("executeTest", type:  .Modal) { variable in
+//        let route = Route("executeTest", type:  .modal) { variable in
 //            let vc = UIViewController(nibName: nil, bundle: nil)
 //            vc.title = "Modal Test"
 //            return vc