From f6d17707358e9eef3effc009ab61edc9533fb57a Mon Sep 17 00:00:00 2001
From: Garrett Mills <glmdev@outlook.com>
Date: Sat, 25 Jun 2016 21:01:07 -0500
Subject: [PATCH] resolved conflicts

---
 composer.json | 10 ----------
 src/Meta.php  | 11 -----------
 2 files changed, 21 deletions(-)

diff --git a/composer.json b/composer.json
index 3a67556..ed81ce7 100644
--- 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
         }
     }
 }
diff --git a/src/Meta.php b/src/Meta.php
index 02849b7..8c558ce 100644
--- a/src/Meta.php
+++ b/src/Meta.php
@@ -159,15 +159,4 @@ class Meta extends Model implements FoundationModel, MetaContract
     }
 
     public static function route(){}
-<<<<<<< HEAD
-=======
-
-    public static function create( array $args ){
-        $args['meta'] = serialize([]);
-        $args['uuid'] = '';
-
-        return parent::create($args);
-    }
-
->>>>>>> refs/remotes/origin/master
 }
\ No newline at end of file