python-project-templates
diff --git a/‎.gitignore‎
Lines changed: 0 additions & 5 deletions b/‎.gitignore‎
Lines changed: 0 additions & 5 deletions
@@ -146,12 +146,7 @@ hatch_cpp/labextension
 
 # Emscripten SDK (locally installed)
 emsdk
-<<<<<<< before updating
-.pyodide_build
-.venv-pyodide
-=======
 .pyodide_build/
->>>>>>> after updating
 
 # Mac
 .DS_Store