fix conflicts

2016-08-23 15:08:01 +02:00
parent e959c22840 982e769d2a
commit 6f6851946b
2 changed files with 3 additions and 0 deletions
--- a/config/app.php
+++ b/config/app.php
@@ -167,6 +167,8 @@ return [
         * Package Service Providers...
         */

+        //
+
        /*
         * Application Service Providers...
         */