revert changed named

package.json

@@ -1,19 +1,6 @@
-<<<<<<< HEAD
-{ "name" : "oauth-tunnel"
-, "description" : "Tunnel integration for oauth lib, make proxy painless."
-, "keywords": [
-    "oauth",
-    "twitter",
-    "tunnel",
-    "proxy",
-    "nodejs"    
-]
-, "version" : "0.0.4"
-=======
 { "name" : "oauth"
 , "description" : "Library for interacting with OAuth 1.0, 1.0A, 2 and Echo.  Provides simplified client access and allows for construction of more complex apis and OAuth providers."
 , "version" : "0.9.10"
->>>>>>> parent of 8073d11... Update package.json
 , "directories" : { "lib" : "./lib" }
 , "main" : "index.js"
 , "author" : "Ciaran Jessup <ciaranj@gmail.com>"