Merge conflicts

This commit is contained in:
Phan An 2017-05-02 00:49:08 +07:00
commit 0521e2e119
No known key found for this signature in database
GPG key ID: 4AF3D4E287BF423F

View file

@ -10,7 +10,6 @@ use App\Services\Streamers\TranscodingStreamer;
use App\Services\Streamers\XAccelRedirectStreamer;
use App\Services\Streamers\XSendFileStreamer;
use Illuminate\Http\Request;
use YouTube;
class SongController extends Controller
{