From 2358047ab5c19127e047ab03e51cea056e401fcf Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 29 Dec 2016 16:58:59 +0000 Subject: [PATCH 1/2] chore(package): update dependencies https://greenkeeper.io/ --- package.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 1a2af73..78926eb 100644 --- a/package.json +++ b/package.json @@ -37,20 +37,20 @@ "can-compute": "^3.0.0", "can-define": "^1.0.0", "can-observation": "^3.0.0", - "can-stream": "^0.0.4", + "can-stream": "^0.0.5", "can-util": "^3.0.0", "kefir": "^3.5.1" }, "devDependencies": { - "bit-docs": "0.0.6", + "bit-docs": "0.0.7", "done-serve": "^0.2.4", "donejs-cli": "^0.9.5", "generator-donejs": "^0.9.0", "jshint": "^2.9.1", - "steal": "^0.16.35", - "steal-qunit": "^0.1.1", - "steal-tools": "^0.16.0", - "testee": "^0.2.4" + "steal": "^1.0.6", + "steal-qunit": "^1.0.0", + "steal-tools": "^1.0.1", + "testee": "^0.3.0" }, "repository": { "type": "git", From 8857e39744ccc58c58075a40ebc2d5fda7c35610 Mon Sep 17 00:00:00 2001 From: Kevin Phillips Date: Thu, 8 Jun 2017 14:40:08 -0500 Subject: [PATCH 2/2] fixing bad merge conflict resolution --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index a5b7c6a..a13b0d4 100644 --- a/package.json +++ b/package.json @@ -37,13 +37,11 @@ "can-define": "^1.0.0", "can-define-stream": "^0.1.0", "can-observation": "^3.0.0", - "can-stream": "^0.0.5", "can-stream-kefir": "^0.2.1", "can-util": "^3.0.0", "kefir": "^3.5.1" }, "devDependencies": { - "bit-docs": "0.0.7", "done-serve": "^0.2.4", "donejs-cli": "^0.9.5", "generator-donejs": "^0.9.0",