fix typo

landlab · Oct 7, 2023 · 4428fa6 · 4428fa6
1 parent 82a0dcb
commit 4428fa6
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/noxfile.py b/noxfile.py
@@ -127,7 +127,6 @@ def build_index(session: nox.Session) -> None:
     session.log(f"generated index at {index_file!s}")
 
 
-<<<<<<< HEAD
 @nox.session(name="build-gallery-index")
 def build_notebook_index(session: nox.Session) -> None:
     docs_dir = ROOT / "docs" / "source"