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

---
 server/manifest.js | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/server/manifest.js b/server/manifest.js
index a9aacaf..b3a59ed 100644
--- a/server/manifest.js
+++ b/server/manifest.js
@@ -13,14 +13,14 @@ module.exports = new Confidence.Store({
     server: {
         host: 'localhost',
         port: {
-            $param: 'PORT',
+            $env: 'PORT',
             $coerce: 'number',
             $default: 3000
         },
         debug: {
-            $filter: 'NODE_ENV',
+            $filter: { $env: 'NODE_ENV' },
             $default: {
-                log: ['error', 'start'],
+                log: ['error'],
                 request: ['error']
             },
             production: {
@@ -35,15 +35,9 @@ module.exports = new Confidence.Store({
                 options: {}
             },
             {
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
                 plugin: './plugins/swagger'
-=======
-=======
->>>>>>> 66973ef ((flavor) objection v3.0.0)
-=======
->>>>>>> 66973ef ((flavor) objection v3.0.0)
+            },
+            {
                 plugin: '@hapipal/schwifty',
                 options: {
                     $filter: 'NODE_ENV',
@@ -65,17 +59,10 @@ module.exports = new Confidence.Store({
                         migrateOnStart: false
                     }
                 }
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 66973ef ((flavor) objection v3.0.0)
-=======
->>>>>>> 66973ef ((flavor) objection v3.0.0)
-=======
->>>>>>> 66973ef ((flavor) objection v3.0.0)
             },
             {
                 plugin: {
-                    $filter: 'NODE_ENV',
+                    $filter: { $env: 'NODE_ENV' },
                     $default: '@hapipal/hpal-debug',
                     production: Toys.noop
                 }