Merge remote-tracking branch 'origin/master'

# Conflicts: # app/Http/Controllers/Agent/kb/PageController.php
2016-06-13 20:46:59 +05:30
parent 9f3e3fbaf3 95d01975fd
commit 226465c496
1 changed files with 4 additions and 0 deletions
--- a/app/Http/Controllers/Agent/kb/PageController.php
+++ b/app/Http/Controllers/Agent/kb/PageController.php
@@ -2,6 +2,10 @@

 namespace App\Http\Controllers\Agent\kb;

+<<<<<<< HEAD
+=======
+// controllers
+>>>>>>> origin/master
 use App\Http\Controllers\Agent\helpdesk\TicketController;
 use App\Http\Controllers\Controller;
 // request