merge conflict

2016-01-08 13:58:35 +01:00 · 2016-01-08 13:58:35 +01:00 · a5750f03c0
commit a5750f03c0
parent 06cdd9b7cd cee64858dd
1 changed files with 3 additions and 3 deletions
--- 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
 			}
 		}