Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix commit conflict markers

Browse Source
This commit is contained in:
Lincoln Stein 2022-12-01 15:07:54 -05:00
parent 540315edaa
commit 6ec64ecb3c
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binary_installer/install.bat.in
View File

@ -140,11 +140,7 @@ set err_msg=----- InvokeAI setup failed -----
.venv\Scripts\python -m pip install %no_cache_dir% --no-warn-script-location -e . .venv\Scripts\python -m pip install %no_cache_dir% --no-warn-script-location -e .
if %errorlevel% neq 0 goto err_exit if %errorlevel% neq 0 goto err_exit
<<<<<<< HEAD:binary_installer/install.bat copy binary_installer\invoke.bat.in .\invoke.bat
copy binary_installer\invoke.bat .\invoke.bat
=======
copy installer\invoke.bat.in .\invoke.bat
>>>>>>> main:binary_installer/install.bat.in
echo ***** Installed invoke launcher script ****** echo ***** Installed invoke launcher script ******
@rem more cleanup @rem more cleanup

6
binary_installer/install.sh.in
View File

@ -213,12 +213,8 @@ _err_exit $? _err_msg
echo -e "\n***** Installed InvokeAI *****\n" echo -e "\n***** Installed InvokeAI *****\n"
<<<<<<< HEAD:binary_installer/install.sh cp binary_installer/invoke.sh.in ./invoke.sh
cp binary_installer/invoke.sh .
=======
cp installer/invoke.sh.in ./invoke.sh
chmod a+x ./invoke.sh chmod a+x ./invoke.sh
>>>>>>> main:binary_installer/install.sh.in
echo -e "\n***** Installed invoke launcher script ******\n" echo -e "\n***** Installed invoke launcher script ******\n"
# more cleanup # more cleanup