Skip to content

Commit

Permalink
wip
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed Jan 9, 2021
1 parent 4872ba9 commit cb39cc5
Showing 1 changed file with 3 additions and 18 deletions.
21 changes: 3 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,5 @@
{
<<<<<<< Updated upstream
"name": "danharrin/squire",
"description": "A library of static Eloquent models for common fixture data.",
"keywords": [
"squire",
"eloquent",
"model",
"sushi",
"laravel"
],
"homepage": "https://github.com/squirephp/squire",
"type": "library",
"license": "MIT",
=======
"name": "squirephp/squire",
>>>>>>> Stashed changes
"authors": [
{
"name": "Dan Harrin",
Expand All @@ -24,7 +9,8 @@
"require": {
"php": "^7.2|^8.0",
"calebporzio/sushi": "^2.1",
"illuminate/database": "^6.0 || ^7.0 || ^8.0"
"illuminate/database": "^6.0 || ^7.0 || ^8.0",
"illuminate/support": "^6.0 || ^7.0 || ^8.0"
},
"require-dev": {
"orchestra/testbench": "^6.2",
Expand Down Expand Up @@ -53,8 +39,7 @@
"Squire\\RepositoryServiceProvider"
],
"aliases": {
"RepositoryManager": "Squire\\Repository\\Facades\\Repository",
"Repository": "Squire\\Repository\\Facades\\Repository"
"RepositoryManager": "Squire\\Repository\\Facades\\Repository"
}
}
},
Expand Down

0 comments on commit cb39cc5

Please sign in to comment.