merge conflict
This commit is contained in:
		| @@ -129,7 +129,7 @@ module.exports = function(grunt) { | |||||||
| 				files: [ 'index.html'] | 				files: [ 'index.html'] | ||||||
| 			}, | 			}, | ||||||
| 			markdown: { | 			markdown: { | ||||||
| 				files: [ './*.md' ] | 				files: [ '*.md' ] | ||||||
| 			}, | 			}, | ||||||
| 			options: { | 			options: { | ||||||
| 				livereload: true | 				livereload: true | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user