Skip to content

Commit

Permalink
Merge branch 'lab-02-first-component-start' into lab-02-first-compone…
Browse files Browse the repository at this point in the history
…nt-solved

* lab-02-first-component-start:
  switching to karma-browserify and removing protractor
  • Loading branch information
brucecoddington committed Aug 11, 2015
2 parents 9f02293 + 9b81e47 commit 09c5d37
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"gulp-util": "^3.0.3",
"gulp-watch": "^4.1.1",
"karma": "^0.13.8",
"karma-bro": "^0.11.1",
"karma-browserify": "^4.3.0",
"karma-chrome-launcher": "^0.2.0",
"karma-firefox-launcher": "^0.1.4",
"karma-mocha": "^0.2.0",
Expand All @@ -91,7 +91,6 @@
"lazypipe": "^1.0.1",
"merge-stream": "^0.1.7",
"mocha": "^2.2.1",
"protractor": "^2.1.0",
"proxyquire": "^1.4.0",
"proxyquire-universal": "^1.0.3",
"proxyquireify": "^3.0.0",
Expand Down

0 comments on commit 09c5d37

Please sign in to comment.