wangbo/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2026-01-11 14:50:49 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fix bad merge of terminal_service

Browse Source
This commit is contained in:
doctorpangloss 2024-11-22 15:55:51 -08:00
parent 63a00aedb5
commit fe64070b41
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
comfy/api_server/services/terminal_service.py
View File

@ -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