bump for diff3 (#2435)

* enable experiment * bump pxt
2019-09-22 07:42:03 -07:00 · 2019-09-22 07:42:03 -07:00 · cb6fbbd317
commit cb6fbbd317
parent 7fb5ffd2f0
2 changed files with 3 additions and 2 deletions
--- a/package.json
+++ b/package.json
@ -46,6 +46,6 @@
  },
  "dependencies": {
    "pxt-common-packages": "6.16.5",
-    "pxt-core": "5.23.11"
+    "pxt-core": "5.23.15"
  }
 }
--- a/pxtarget.json
+++ b/pxtarget.json
@ -303,7 +303,8 @@
            "bluetoothPartialFlashing",
            "simScreenshot",
            "simGif",
-            "qrCode"
+            "qrCode",
+            "githubBlocksDiff"
        ],
        "bluetoothUartFilters": [
            {