merge prior to backing out PR #1000

2024-08-30 20:32:17 +00:00 · 2022-10-09 18:24:15 -04:00
parent a4c36dbc15 3bc1ff5e5a
commit 3d4276439f
30 changed files with 692 additions and 124 deletions
--- a/docs/assets/Lincoln-and-Parrot-512-transparent.png
+++ b/docs/assets/Lincoln-and-Parrot-512-transparent.png
--- a/docs/assets/Lincoln-and-Parrot-512.png
+++ b/docs/assets/Lincoln-and-Parrot-512.png
--- a/docs/assets/invoke-web-server-1.png
+++ b/docs/assets/invoke-web-server-1.png
--- a/docs/assets/invoke-web-server-2.png
+++ b/docs/assets/invoke-web-server-2.png
--- a/docs/assets/invoke-web-server-3.png
+++ b/docs/assets/invoke-web-server-3.png
--- a/docs/assets/invoke-web-server-4.png
+++ b/docs/assets/invoke-web-server-4.png
--- a/docs/assets/invoke-web-server-5.png
+++ b/docs/assets/invoke-web-server-5.png
--- a/docs/assets/invoke-web-server-6.png
+++ b/docs/assets/invoke-web-server-6.png
--- a/docs/assets/invoke-web-server-7.png
+++ b/docs/assets/invoke-web-server-7.png
--- a/docs/assets/invoke-web-server-8.png
+++ b/docs/assets/invoke-web-server-8.png
--- a/docs/assets/invoke_web_server.png
+++ b/docs/assets/invoke_web_server.png
--- a/docs/installation/INSTALL_MAC.md
+++ b/docs/installation/INSTALL_MAC.md
@ -75,7 +75,6 @@ git clone https://github.com/invoke-ai/InvokeAI.git
 cd InvokeAI

 ### WAIT FOR THE CHECKPOINT FILE TO DOWNLOAD, THEN PROCEED ###
->>>>>>> Updates INSTALL_MAC.md

 # We will leave the big checkpoint wherever you stashed it for long-term storage,
 # and make a link to it from the repo's folder. This allows you to use it for