jan/revproxy-presentation
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge conflict

Browse source
This commit is contained in:
Hakim El Hattab 2016-01-08 13:58:35 +01:00
commit a5750f03c0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Gruntfile.js
View file

@ -113,9 +113,6 @@ module.exports = function(grunt) {
},
watch: {
options: {
livereload: true
},
js: {
files: [ 'Gruntfile.js', 'js/reveal.js' ],
tasks: 'js'
@ -133,6 +130,9 @@ module.exports = function(grunt) {
},
markdown: {
files: [ './*.md' ]
},
options: {
livereload: true
}
}