Fix rebase

voila-dashboards · Jul 27, 2023 · 6e395b6 · 6e395b6
1 parent f959d28
commit 6e395b6
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/voila/treehandler.py b/voila/treehandler.py
@@ -12,12 +12,10 @@
 
 from jupyter_server.utils import url_path_join, url_escape
 
+from nbclient.util import ensure_async
+
 from .utils import get_server_root_dir
-<<<<<<< HEAD
 from .handler import BaseVoilaHandler
-=======
-from nbclient.util import ensure_async
->>>>>>> e30f6aa (Migrating to `jupyter-server` 2, `jupyter_client` 7.x (#1308))
 
 
 class VoilaTreeHandler(BaseVoilaHandler):