Merge pull request #103 from 4GeeksAcademy/master

Rebuild container fix
breatheco-de · Jul 10, 2024 · b2e250f · b2e250f
2 parents 88b304f + 8a930d0
commit b2e250f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -22,11 +22,7 @@
 			"extensions": ["learn-pack.learnpack-vscode"]
 		}
 	},
-<<<<<<< master
-	"onCreateCommand": "pip3 install pytest==6.2.5 mock pytest-testdox toml && npm i @learnpack/[email protected] -g && learnpack plugins:install @learnpack/[email protected]"
-=======
 	"onCreateCommand": "pip3 install pytest==6.2.5 mock pytest-testdox toml && npm i @learnpack/[email protected] -g && learnpack plugins:install @learnpack/[email protected]"
->>>>>>> master
 
 	// Features to add to the dev container. More info: https://containers.dev/features.
 	// "features": {},