conflicts

.gitlab-ci.yml

-image: omalaspinas/hakyll-bootstrap:latest
+image: omalaspinas/hakyll-test:latest
 # image: omalaspinas/pandoc_website:latest
 
 variables:

hakyll-bootstrap/Makefile

@@ -13,7 +13,9 @@ build: Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md
 	make -C cours/isc_physics
 	make markdown -C cours/prog_seq/slides
 	# stack build && stack exec blog -- build
-	cabal install && blog build
+	# cabal install && blog build
+	# stack build && stack exec blog -- build
+	blog build
 
 build_revealjs:
 	cd reveal.js && npm install && npm run build && cd ..