diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 13:58:35 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-08 13:58:35 +0100 |
| commit | a5750f03c086b0aaafc669682b295adc49150903 (patch) | |
| tree | 4861aeeff270fa08c7286692857706dc11f3fa92 /Gruntfile.js | |
| parent | 06cdd9b7cd62ffde1f8ebcc91b66ae45944718c7 (diff) | |
| parent | cee64858dd0e0bb4aed195f04dc6d74b2980cdfa (diff) | |
| download | freenode-live-2017-presentation-a5750f03c086b0aaafc669682b295adc49150903.tar freenode-live-2017-presentation-a5750f03c086b0aaafc669682b295adc49150903.tar.gz | |
merge conflict
Diffstat (limited to 'Gruntfile.js')
| -rw-r--r-- | Gruntfile.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 675adff..5b11c2b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -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 } } |