fix conflicts

2017-04-07 08:11:06 -05:00
parent 33c4cab6b7 c6e3d6e5b4
commit 4696e7bcb6
21 changed files with 83 additions and 44 deletions
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,11 @@
            "database"
        ],
        "psr-4": {
-            "App\\": "app/",
+            "App\\": "app/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
            "Tests\\": "tests/"
        }
    },
@@ -42,8 +46,7 @@
    },
    "config": {
        "preferred-install": "dist",
-        "sort-packages": true
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
+        "sort-packages": true,
+        "optimize-autoloader": true
+    }
 }