From cf3f38b90d88d9d3ee4d5abcc18880f43204231c Mon Sep 17 00:00:00 2001
From: Henk <henk@henk.tech>
Date: Tue, 6 Sep 2022 01:54:18 +0200
Subject: [PATCH] Fix merge artifacts

---
 aiserver.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index faa738ce..cdd50ed5 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -2131,7 +2131,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
             if changed:
                 with open(get_config_filename(), "w") as file:
                     file.write(json.dumps(js, indent=3))
-<<<<<<< HEAD
+
         # Swap OAI Server if GooseAI was selected
         if(vars.model == "GooseAI"):
             vars.oaiengines = "https://api.goose.ai/v1/engines"
@@ -2139,8 +2139,6 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
             args.configname = "GooseAI" + "/" + online_model
         elif vars.model != "CLUSTER":
             args.configname = vars.model + "/" + online_model
-=======
->>>>>>> 296481f4aae46ce3d665537744460f1d3c0947a2
         vars.oaiurl = vars.oaiengines + "/{0}/completions".format(online_model)