From 9b984e0d1eb022e27c3e17b002cc9fdf3fcfea5e Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Tue, 1 Nov 2022 21:54:35 +1100
Subject: [PATCH] resolve conflicts

---
 backend/invoke_ai_web_server.py                       | 5 +++++
 frontend/src/features/gallery/CurrentImageButtons.tsx | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/backend/invoke_ai_web_server.py b/backend/invoke_ai_web_server.py
index a9d92de400..44b5939f10 100644
--- a/backend/invoke_ai_web_server.py
+++ b/backend/invoke_ai_web_server.py
@@ -654,7 +654,12 @@ class InvokeAIWebServer:
                     height *= 8
                     buffered = io.BytesIO()
                     image.save(buffered, format="PNG")
+<<<<<<< HEAD
                     img_base64 = "data:image/jpeg;base64," + base64.b64encode(buffered.getvalue()).decode('UTF-8')
+=======
+                    img_str = base64.b64encode(buffered.getvalue()).decode('UTF-8')
+                    img_base64 = "data:image/jpeg;base64," + img_str
+>>>>>>> 4013e8a... Fixes b64 image sending and displaying
                     self.socketio.emit(
                         "intermediateResult",
                         {
diff --git a/frontend/src/features/gallery/CurrentImageButtons.tsx b/frontend/src/features/gallery/CurrentImageButtons.tsx
index b95e16dda9..e58b2ac918 100644
--- a/frontend/src/features/gallery/CurrentImageButtons.tsx
+++ b/frontend/src/features/gallery/CurrentImageButtons.tsx
@@ -61,7 +61,11 @@ const systemSelector = createSelector(
     const { upscalingLevel, facetoolStrength, shouldShowImageDetails } =
       options;
 
+<<<<<<< HEAD
     const { intermediateImage, currentImage } = gallery;
+=======
+    const { intermediateImage } = gallery;
+>>>>>>> 4013e8a... Fixes b64 image sending and displaying
 
     return {
       isProcessing,