Skip to content

Commit

Permalink
Merge branch 'master' of github.com:avos/grunt-commonjs
Browse files Browse the repository at this point in the history
Conflicts:
	.gitignore
	README.md
  • Loading branch information
chrisabrams committed Jan 29, 2013
2 parents d9d07ce + 6b3b62f commit 4ff32fd
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,17 @@
node_modules/*
.DS_Store
.DS_Store

lib-cov
*.seed
*.log
*.csv
*.dat
*.out
*.pid
*.gz

pids
logs
results

npm-debug.log

0 comments on commit 4ff32fd

Please sign in to comment.