From fe64070b418654816733253bb0f61e61ce79f8d4 Mon Sep 17 00:00:00 2001
From: doctorpangloss <@hiddenswitch.com>
Date: Fri, 22 Nov 2024 15:55:51 -0800
Subject: [PATCH] Fix bad merge of terminal_service

---
 comfy/api_server/services/terminal_service.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/comfy/api_server/services/terminal_service.py b/comfy/api_server/services/terminal_service.py
index 482d016b7..9bd235001 100644
--- a/comfy/api_server/services/terminal_service.py
+++ b/comfy/api_server/services/terminal_service.py
@@ -26,16 +26,10 @@ class TerminalService:
     def update_size(self):
         columns, lines = self.get_terminal_size()
         changed = False
-<<<<<<< HEAD:comfy/api_server/services/terminal_service.py
-        if sz.columns != self.cols:
-            self.cols = sz.columns
-            changed = True
-=======
-        
+
         if columns != self.cols:
             self.cols = columns
-            changed = True 
->>>>>>> 6e8cdcd3cb542ba9eb5a5e5a420eff06f59dd268:api_server/services/terminal_service.py
+            changed = True
 
         if lines != self.rows:
             self.rows = lines