Resolving merge conflicts

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2156 1509560c-5e2a-0410-865c-31c25e1cfdef
haxenme · Oct 26, 2012 · 7ead4ca · 7ead4ca
1 parent 6d6bbb9
commit 7ead4ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "smoke.jeash.com",
+  "name": "application-name",
   "version": "0.0.1",
   "private": true,
   "scripts": {
     "start": "node app"
   },
   "dependencies": {
-    "express": "3.x",
+    "express": "3.0.0alpha1",
     "jade": "*"
   }
-}
+}
diff --git a/tools/smoke.jeash.com/package.json b/tools/smoke.jeash.com/package.json