From cb6fbbd31785f7c2d2b092b7755cf8bbd63b0390 Mon Sep 17 00:00:00 2001
From: Peli de Halleux <pelikhan@users.noreply.github.com>
Date: Sun, 22 Sep 2019 07:42:03 -0700
Subject: [PATCH] bump for diff3 (#2435)

* enable experiment

* bump pxt
---
 package.json  | 2 +-
 pxtarget.json | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 07290421..8f3aad54 100644
--- 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"
   }
 }
diff --git a/pxtarget.json b/pxtarget.json
index 3b84687a..f48f1beb 100644
--- a/pxtarget.json
+++ b/pxtarget.json
@@ -303,7 +303,8 @@
             "bluetoothPartialFlashing",
             "simScreenshot",
             "simGif",
-            "qrCode"
+            "qrCode",
+            "githubBlocksDiff"
         ],
         "bluetoothUartFilters": [
             {