From 6ec64ecb3cf992de8f189f3bd697ca28d835e7cc Mon Sep 17 00:00:00 2001
From: Lincoln Stein <lincoln.stein@gmail.com>
Date: Thu, 1 Dec 2022 15:07:54 -0500
Subject: [PATCH] fix commit conflict markers

---
 binary_installer/install.bat.in | 6 +-----
 binary_installer/install.sh.in  | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/binary_installer/install.bat.in b/binary_installer/install.bat.in
index aaf71160af..feba071f80 100644
--- a/binary_installer/install.bat.in
+++ b/binary_installer/install.bat.in
@@ -140,11 +140,7 @@ set err_msg=----- InvokeAI setup failed -----
 .venv\Scripts\python -m pip install %no_cache_dir% --no-warn-script-location -e .
 if %errorlevel% neq 0 goto err_exit
 
-<<<<<<< HEAD:binary_installer/install.bat
-copy binary_installer\invoke.bat .\invoke.bat
-=======
-copy installer\invoke.bat.in .\invoke.bat
->>>>>>> main:binary_installer/install.bat.in
+copy binary_installer\invoke.bat.in .\invoke.bat
 echo ***** Installed invoke launcher script ******
 
 @rem more cleanup
diff --git a/binary_installer/install.sh.in b/binary_installer/install.sh.in
index c080884903..7597ce524e 100644
--- a/binary_installer/install.sh.in
+++ b/binary_installer/install.sh.in
@@ -213,12 +213,8 @@ _err_exit $? _err_msg
 
 echo -e "\n***** Installed InvokeAI *****\n"
 
-<<<<<<< HEAD:binary_installer/install.sh
-cp binary_installer/invoke.sh .
-=======
-cp installer/invoke.sh.in ./invoke.sh
+cp binary_installer/invoke.sh.in ./invoke.sh
 chmod a+x ./invoke.sh
->>>>>>> main:binary_installer/install.sh.in
 echo -e "\n***** Installed invoke launcher script ******\n"
 
 # more cleanup