nick/overland-controller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: remove leftover conflict marker

Browse Source
This commit is contained in:
nick
2026-06-08 08:16:34 -06:00
parent 9c2069dd28
commit dc70e4f8e5
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_http_api_contract.py
-3
View File
@@ -352,7 +352,6 @@ def test_embedded_webui_config_page_is_grouped():
assert "Relay Outputs" in source assert "Relay Outputs" in source
assert "Temperature Assignment" in source assert "Temperature Assignment" in source
assert "Maintenance" in source assert "Maintenance" in source
<<<<<<< HEAD
def test_embedded_webui_config_subtabs(): def test_embedded_webui_config_subtabs():
@@ -376,5 +375,3 @@ def test_embedded_webui_api_badge_labels_are_clear():
assert "API Live" in source assert "API Live" in source
assert "API Error" in source assert "API Error" in source
assert 'textContent="Offline"' not in source assert 'textContent="Offline"' not in source
=======
>>>>>>> parent of 2f973a2 (webui: organize config page with subtabs)