Skip to content

Commit

Permalink
Merge branch 'remove-keywords' of github.com:andrewrk/node-temp
Browse files Browse the repository at this point in the history
Conflicts:
	package.json
  • Loading branch information
andrewrk committed Feb 26, 2014
2 parents b9823cf + af2a205 commit fdf0217
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,7 @@
"tempdir",
"tempfile",
"tmpdir",
"tmpfile",
"data",
"processing",
"workers",
"grunt",
"scripts"
"tmpfile"
],
"devDependencies": {},
"repository": {
Expand Down

0 comments on commit fdf0217

Please sign in to comment.