Skip to content

Commit

Permalink
merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
hakimel committed Apr 10, 2016
2 parents 0fedfbe + 2dc546f commit 87b24dd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ module.exports = function(grunt) {
files: [ 'index.html']
},
markdown: {
files: [ './*.md' ]
files: [ '*.md' ]
},
options: {
livereload: true
Expand Down

0 comments on commit 87b24dd

Please sign in to comment.