Merge remote-tracking branch 'origin/master'

# Conflicts: # package.json
2016-06-16 16:16:08 -04:00
parent 4d9450dd06 910870e46f
commit 3efbb4fbde
2 changed files with 8 additions and 4 deletions
--- a/package.json
+++ b/package.json
@ -1,6 +1,10 @@
 {
  "name": "pxt-microbit",
+<<<<<<< HEAD
  "version": "0.2.166",
+=======
+  "version": "0.2.168",
+>>>>>>> origin/master
  "description": "BBC micro:bit target for PXT",
  "keywords": [
    "JavaScript",
@ -29,6 +33,6 @@
    "typescript": "^1.8.7"
  },
  "dependencies": {
-    "pxt-core": "0.2.179"
+    "pxt-core": "0.2.180"
  }
 }