clean before merger
This commit is contained in:
commit
26616faef1
@ -9,6 +9,7 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"require": {
|
"require": {
|
||||||
|
<<<<<<< HEAD
|
||||||
"illuminate/support": "^5.2",
|
"illuminate/support": "^5.2",
|
||||||
"illuminate/database": "^5.2",
|
"illuminate/database": "^5.2",
|
||||||
"ramsey/uuid": "^3.4",
|
"ramsey/uuid": "^3.4",
|
||||||
@ -21,6 +22,15 @@
|
|||||||
"psr-4": {
|
"psr-4": {
|
||||||
"Glmdev\\Meta\\": "src/",
|
"Glmdev\\Meta\\": "src/",
|
||||||
"Glmdev\\Meta\\Tests\\": "tests/"
|
"Glmdev\\Meta\\Tests\\": "tests/"
|
||||||
|
=======
|
||||||
|
"ramsey/uuid": "^3.2",
|
||||||
|
"glmdev/foundation": "*"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"psr-4": {
|
||||||
|
"AppRoot\\": "../../../app/",
|
||||||
|
"Glmdev\\Meta\\": "src/"
|
||||||
|
>>>>>>> refs/remotes/origin/master
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
11
src/Meta.php
11
src/Meta.php
@ -159,4 +159,15 @@ class Meta extends Model implements FoundationModel, MetaContract
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static function route(){}
|
public static function route(){}
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
|
public static function create( array $args ){
|
||||||
|
$args['meta'] = serialize([]);
|
||||||
|
$args['uuid'] = '';
|
||||||
|
|
||||||
|
return parent::create($args);
|
||||||
|
}
|
||||||
|
|
||||||
|
>>>>>>> refs/remotes/origin/master
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user