resolving conflict

Azure · Aug 14, 2012 · 57c6bea · 57c6bea
2 parents e5d8623 + 7315973
commit 57c6bea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/examples/blobuploader/package.json b/examples/blobuploader/package.json
@@ -3,7 +3,7 @@
   , "version": "0.0.1"
   , "private": true
   , "dependencies": {
-      "express": ">= 2.4.7"
+      "express": "2.x"
     , "ejs": ">= 0.4.3"
     , "formidable": ">= 1.0.6"
     , "azure": ">= 0.5.1"

diff --git a/examples/blog/package.json b/examples/blog/package.json
@@ -3,7 +3,7 @@
   , "version": "0.0.1"
   , "private": true
   , "dependencies": {
-      "express": ">= 2.4.7"
+      "express": "2.x"
     , "stylus": ">= 0.0.1"
     , "ejs": ">= 0.4.3"
     , "node-uuid": ">= 1.2.0"

diff --git a/examples/tasklist/package.json b/examples/tasklist/package.json
@@ -3,7 +3,7 @@
   , "version": "0.0.1"
   , "private": true
   , "dependencies": {
-      "express": ">= 2.4.7"
+      "express": "2.x"
     , "ejs": ">= 0.4.3"
     , "jade": ">= 0.18.0"
     , "node-uuid": "> = 1.2.0"