Clean up diffs between branches

This commit is contained in:
Hillel Coren 2016-05-10 22:39:54 +03:00
parent 3c21179e4e
commit 147c51f6f9
3 changed files with 3 additions and 2 deletions

View File

@ -1,5 +1,6 @@
<?php
/*
|--------------------------------------------------------------------------
| Application Routes

2
composer.lock generated
View File

@ -9900,4 +9900,4 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": []
}
}

View File

@ -189,4 +189,4 @@
@stop
@stop