Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Resolving merge conflicts

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2156 1509560c-5e2a-0410-865c-31c25e1cfdef
  • Loading branch information...
commit 7ead4ca6b1ec9d30fd85e31c2dbfbd751083d0a4 1 parent 6d6bbb9
Joshua Granick jgranick authored
Showing with 3 additions and 15 deletions.
  1. +3 −3 package.json
  2. +0 −12 tools/smoke.jeash.com/package.json
6 package.json
View
@@ -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": "*"
}
-}
+}
12 tools/smoke.jeash.com/package.json
View
@@ -1,12 +0,0 @@
-{
- "name": "application-name",
- "version": "0.0.1",
- "private": true,
- "scripts": {
- "start": "node app"
- },
- "dependencies": {
- "express": "3.0.0alpha1",
- "jade": "*"
- }
-}
Please sign in to comment.
Something went wrong with that request. Please try again.