1.0.7.5

2016-06-13 20:48:00 +05:30
parent 226465c496
commit 4c25919b65
1 changed files with 0 additions and 4 deletions
--- 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