merge conflicts

bff563db · Vipul Basapati · ec0d5e2f · 5119c782 · bff563db
Commit bff563db authored Nov 14, 2017 by Vipul Basapati
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

composer.json composer.json +2 -1

No files found.
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,8 @@
            "database"
        ],
        "psr-4": {
-            "App\\": "app/"
+            "App\\": "app/",
+            "Bvipul\\Generator\\": "packages/bvipul/generator/src/"
        },
        "files": [
            "app/Helpers/helpers.php"