cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	app/Http/Controllers/Agent/kb/PageController.php
This commit is contained in:
Sujit Prasad
2016-06-13 20:46:59 +05:30
parent 9f3e3fbaf3 95d01975fd
commit 226465c496
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Agent/kb/PageController.php
View File

@@ -2,6 +2,10 @@
namespace App\Http\Controllers\Agent\kb; namespace App\Http\Controllers\Agent\kb;
<<<<<<< HEAD
=======
// controllers
>>>>>>> origin/master
use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Agent\helpdesk\TicketController;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
// request // request