Remove conflict message

HavokInspiration · Oct 4, 2017 · c3e62b3 · c3e62b3
1 parent daf6bd7
commit c3e62b3
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/Mode/View.php b/src/Mode/View.php
@@ -20,12 +20,9 @@
 
 /**
  * `View` Maintenance Mode.
-<<<<<<< HEAD
+ *
  * When used, it will render the defined View and use it as the body of the
  * response to return
-=======
- * When used, it will send the content of the configured file as a response
->>>>>>> The "View" maintenance mode is now PSR-7 compatible
  */
 class View extends Mode
 {