Permalink
Browse files

Fixed test cases and request.js

  • Loading branch information...
1 parent fded58a commit f6c7de09503844525181184da4c12ad116511e64 @iwillwen committed Mar 14, 2013
Showing with 3 additions and 43 deletions.
  1. +1 −5 .gitignore
  2. +1 −5 .npmignore
  3. +1 −30 README.md
  4. +0 −3 package.json
View
@@ -1,7 +1,3 @@
node_modules
**.txt
-<<<<<<< HEAD
-npm_debug.log
-=======
-npm_debug.log
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
+npm_debug.log
View
@@ -1,7 +1,3 @@
node_modules
**.txt
-<<<<<<< HEAD
-npm_debug.log
-=======
-npm_debug.log
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
+npm_debug.log
View
@@ -1,10 +1,6 @@
# webjs: Simple HTTP / TCP development framework.
-<<<<<<< HEAD
-For detailed information about this, please visit the [webjs homepage](http://web.c61.me). 如果想获得详细的关于Web.js的信息,请浏览[官方网站](http://web.c61.me)。
-=======
For detailed information about this, please visit the [webjs homepage](http://webjs.im1996.com). 如果想获得详细的关于Web.js的信息,请浏览[官方网站](http://webjs.im1996.com)。
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
# Install
$ npm install webjs
@@ -253,30 +249,6 @@ You can use it to modular your app functions.
# License
-<<<<<<< HEAD
-(The MIT License)
-
-Copyright (c) 2010-2012 Will Wen Gunn (甘超阳) &lt;willwengunn@gmail.com&gt;
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-=======
(The MIT License)
Copyright (c) 2010-2013 Will Wen Gunn (甘超阳) <willwengunn@gmail.com>
@@ -298,5 +270,4 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
@@ -34,12 +34,9 @@
"mime": "latest",
"crc": "latest"
},
-<<<<<<< HEAD
-=======
"scripts": {
"test": "mocha -R spec"
},
->>>>>>> cb1b824aa9bb6a71e5bf597704395773669e108c
"bin": {
"webjs": "./bin/webjs"
},

0 comments on commit f6c7de0

Please sign in to comment.