From 4c25919b65c753bb03da6651d0b2726f7f083684 Mon Sep 17 00:00:00 2001 From: Sujit Prasad Date: Mon, 13 Jun 2016 20:48:00 +0530 Subject: [PATCH] 1.0.7.5 --- app/Http/Controllers/Agent/kb/PageController.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php index 1c18b6a27..ada665b4e 100644 --- a/app/Http/Controllers/Agent/kb/PageController.php +++ b/app/Http/Controllers/Agent/kb/PageController.php @@ -2,10 +2,6 @@ namespace App\Http\Controllers\Agent\kb; -<<<<<<< HEAD -======= -// controllers ->>>>>>> origin/master use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Controller; // request