Skip to content
Snippets Groups Projects
Verified Commit 6d7dea34 authored by orestis.malaspin's avatar orestis.malaspin
Browse files

conflict

parent efb4ea6f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
slides/Makefile
+ 2
− 1
View file @ 6d7dea34
...@@ -23,7 +23,8 @@ HTML=$(MD:%.md=%.html) # Pour les fichier html on transforme .md -> .html ...@@ -23,7 +23,8 @@ HTML=$(MD:%.md=%.html) # Pour les fichier html on transforme .md -> .html
MARKDOWN=$(MD:%.md=%.markdown) # Pour les fichier markdown on transforme .md -> .markdown MARKDOWN=$(MD:%.md=%.markdown) # Pour les fichier markdown on transforme .md -> .markdown
CHROMIUM:=$(shell which chromium || which chromium-browser) CHROMIUM:=$(shell which chromium || which chromium-browser)
all: puppeteer $(PDF) $(HTML) # La cible par défaut (all) exécute les cibles %.pdf all: puppeteer $(PDF)
# all: puppeteer $(PDF) $(HTML) # La cible par défaut (all) exécute les cibles %.pdf
docker: docker-compose.yml docker: docker-compose.yml
docker-compose run slides make puppeteer -k || true docker-compose run slides make puppeteer -k || true
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment