Fixed merge conflicts.

BottleRocketStudios · Aug 17, 2018 · 5dbc467 · 5dbc467
1 parent 457844f
commit 5dbc467
Show file tree

Hide file tree

Showing 2 changed files with 900 additions and 900 deletions.
diff --git a/Sources/UtiliKit/Container/ContainerViewController+ManagedChildren.swift b/Sources/UtiliKit/Container/ContainerViewController+ManagedChildren.swift
@@ -22,9 +22,9 @@ public extension ContainerViewController {
         return nextIndex < managedChildren.endIndex ? nextIndex : nil
     }
 
-    // MARK: Removing a Child
-    func removeChild(_ child: Child) {
-        let removed = managedChildren.index(of: child).flatMap { managedChildren.remove(at: $0) }
+    // MARK: Removing a ManagedChild
+    func removeChild(_ child: ManagedChild) {
+        let removed = managedChildren.index { $0.identifier == child.identifier }.flatMap { managedChildren.remove(at: $0) }
         #if swift(>=4.2)
         removed?.viewController.removeFromParent()
         #else