Remove weird comment

iZettle · Jul 17, 2019 · f14b804 · f14b804
1 parent 6e5f56d
commit f14b804
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/Presentation/PresentationStyle.swift b/Presentation/PresentationStyle.swift
@@ -112,10 +112,6 @@ public extension PresentationStyle {
                         }
                     }
 
-<<<<<<< HEAD
-                    // very weird, why not called?
-=======
->>>>>>> bf67770293a48f45351892bd606e3d980431ba11
                     bag += viewController.installDismissButton().onValue {
                         completion(.failure(PresentError.dismissed))
                     }