clean before merger

2016-06-25 20:53:47 -05:00
parent 110ff0a15c 6d6af4faf9
commit 26616faef1
2 changed files with 21 additions and 0 deletions
--- a/composer.json
+++ b/composer.json
@@ -9,6 +9,7 @@
        }
    ],
    "require": {
+<<<<<<< HEAD
        "illuminate/support": "^5.2",
        "illuminate/database": "^5.2",
        "ramsey/uuid": "^3.4",
@@ -21,6 +22,15 @@
        "psr-4": {
            "Glmdev\\Meta\\": "src/",
            "Glmdev\\Meta\\Tests\\": "tests/"
+=======
+        "ramsey/uuid": "^3.2",
+        "glmdev/foundation": "*"
+    },
+    "autoload": {
+        "psr-4": {
+            "AppRoot\\": "../../../app/",
+            "Glmdev\\Meta\\": "src/"
+>>>>>>> refs/remotes/origin/master
        }
    }
 }