dirk
/
why-cant-we-deploy-today
1
0
Fork 0
Code Releases Activity

merge conflict

This commit is contained in:
Hakim El Hattab 2016-01-08 13:58:35 +01:00
parent 06cdd9b7cd cee64858dd
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: { watch: {
options: {
livereload: true
},
js: { js: {
files: [ 'Gruntfile.js', 'js/reveal.js' ], files: [ 'Gruntfile.js', 'js/reveal.js' ],
tasks: 'js' tasks: 'js'
@ -133,6 +130,9 @@ module.exports = function(grunt) {
}, },
markdown: { markdown: {
files: [ './*.md' ] files: [ './*.md' ]
},
options: {
livereload: true
} }
} }