chore: fix merge conflicts

This commit is contained in:
Austin Pickett 2026-03-29 20:52:18 -04:00
parent 6d13dab7c9
commit 572d7bd9f4

View file

@ -2462,7 +2462,6 @@ def cmd_uninstall(args):
run_uninstall(args)
<<<<<<< HEAD
def _clear_bytecode_cache(root: Path) -> int:
"""Remove all __pycache__ directories under *root*.
@ -2489,7 +2488,6 @@ def _clear_bytecode_cache(root: Path) -> int:
pass
dirnames.clear() # nothing left to recurse into
return removed
=======
def cmd_web(args):
"""Start the web UI server."""
try:
@ -2532,7 +2530,6 @@ def cmd_web(args):
port=args.port,
open_browser=not args.no_open,
)
>>>>>>> 4a23336e (feat: web ui to manage hermes agent)
def _update_via_zip(args):