From cb39cc53f0b34e5049343eb2e64f6568afb3d9f4 Mon Sep 17 00:00:00 2001
From: Dan Harrin <git@danharrin.com>
Date: Sat, 9 Jan 2021 21:13:35 +0000
Subject: [PATCH] wip

---
 composer.json | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 2f64151..e4ca760 100644
--- a/composer.json
+++ b/composer.json
@@ -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",
@@ -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",
@@ -53,8 +39,7 @@
                 "Squire\\RepositoryServiceProvider"
             ],
             "aliases": {
-                "RepositoryManager": "Squire\\Repository\\Facades\\Repository",
-                "Repository": "Squire\\Repository\\Facades\\Repository"
+                "RepositoryManager": "Squire\\Repository\\Facades\\Repository"
             }
         }
     },