From 1f4f56a05cd2070f6310bbb8810d439f186bde2f Mon Sep 17 00:00:00 2001
From: Devin Ivy <devin@bigroomstudios.com>
Date: Sun, 11 Apr 2021 23:24:33 -0400
Subject: [PATCH] package

---
 package.json       | 9 +++++++++
 server/manifest.js | 6 ++++++
 2 files changed, 15 insertions(+)

diff --git a/package.json b/package.json
index c5fcc28..df3d287 100644
--- a/package.json
+++ b/package.json
@@ -30,8 +30,12 @@
     "@hapi/eslint-plugin-hapi": "4.x.x",
     "@hapi/glue": "8.x.x",
     "@hapi/hapi": "20.x.x",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "@hapi/inert": "6.x.x",
+=======
+    "@hapi/hoek": "9.x.x",
+>>>>>>> 66973ef ((flavor) objection v3.0.0)
 =======
     "@hapi/hoek": "9.x.x",
 >>>>>>> 66973ef ((flavor) objection v3.0.0)
@@ -45,8 +49,13 @@
     "dotenv": "8.x.x",
     "eslint": "7.x.x",
     "exiting": "6.x.x",
+<<<<<<< HEAD
 <<<<<<< HEAD
     "hapi-swagger": "14.x.x"
+=======
+    "knex": "0.21.x",
+    "sqlite3": "5.x.x"
+>>>>>>> 66973ef ((flavor) objection v3.0.0)
 =======
     "knex": "0.21.x",
     "sqlite3": "5.x.x"
diff --git a/server/manifest.js b/server/manifest.js
index 6233f93..f1b8278 100644
--- a/server/manifest.js
+++ b/server/manifest.js
@@ -35,9 +35,12 @@ module.exports = new Confidence.Store({
                 options: {}
             },
             {
+<<<<<<< HEAD
 <<<<<<< HEAD
                 plugin: './plugins/swagger'
 =======
+=======
+>>>>>>> 66973ef ((flavor) objection v3.0.0)
                 plugin: '@hapipal/schwifty',
                 options: {
                     $filter: 'NODE_ENV',
@@ -59,6 +62,9 @@ module.exports = new Confidence.Store({
                         migrateOnStart: false
                     }
                 }
+<<<<<<< HEAD
+>>>>>>> 66973ef ((flavor) objection v3.0.0)
+=======
 >>>>>>> 66973ef ((flavor) objection v3.0.0)
             },
             {