resolved conflicts

2016-06-25 21:01:07 -05:00
parent a4cdebb12a
commit f6d1770735
2 changed files with 0 additions and 21 deletions
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,6 @@
        }
    ],
    "require": {
-<<<<<<< HEAD
        "illuminate/support": "^5.2",
        "illuminate/database": "^5.2",
        "ramsey/uuid": "^3.4",
@@ -22,15 +21,6 @@
        "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
        }
    }
 }