diff options
| author | Johannes <mail@johannesewald.de> | 2012-06-04 04:39:58 +0400 |
|---|---|---|
| committer | Johannes <mail@johannesewald.de> | 2012-06-04 04:39:58 +0400 |
| commit | 9b9944227159af735434316fad7bd89cea945670 (patch) | |
| tree | 5e07c2e383a518208f74771845e318f97546744e | |
| parent | 811c508cd681b6da8697c1a092550e056c1b4a61 (diff) | |
| parent | c1d0f6632ce34df4648383a26ece6eb54fa3eff0 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
package.json
| -rw-r--r-- | package.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json index c9f18a6..7f146a7 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "email" : "mail@johannesewald.de",
"web" : "http://johannesewald.de"
},
- "main" : "./lib/index.js",
+ "main" : "lib/index.js",
"bugs" : {
"url" : "http://github.com/jhnns/rewire/issues",
"email" : "mail@johannesewald.de"
|