Fix rebase issue

2015-08-31 08:54:01 +01:00
parent 6ee697cf7f
commit 25a3626de5
1 changed files with 0 additions and 4 deletions
--- a/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
+++ b/app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
@@ -59,13 +59,9 @@ class SendMaintenanceEmailNotificationHandler
    /**
     * Handle the event.
     *
-<<<<<<< cc10f8f42347c5fdfe7e464bedd3a388059ebc4b
     * @param \CachetHQ\Cachet\Events\MaintenanceHasScheduledEvent $event
     *
     * @return void
-=======
-     * @param \CachetHQ\Cachet\Events\MaintenanceWasScheduledEvent $event
->>>>>>> Rename incident events and fixes
     */
    public function handle(MaintenanceWasScheduledEvent $event)
    {