merge conflict
This commit is contained in:
commit
a5750f03c0
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue