draftbit · idkjs · Mar 30, 2018 · Mar 30, 2018 · Apr 16, 2018 · Apr 16, 2018
diff --git a/.gitattributes b/.gitattributes
diff --git a/packages/reason-expo/package.json b/packages/reason-expo/package.json
@@ -1,7 +1,11 @@
 {
   "name": "reason-expo",
   "description": "ReasonML bindings for Expo",
+<<<<<<< HEAD
   "version": "36.0.0",
+=======
+  "version": "34.4.1",
+>>>>>>> master
   "scripts": {
     "build": "bsb -make-world",
     "watch": "bsb -make-world -w",

diff --git a/packages/reason-expo/src/SQLite.re b/packages/reason-expo/src/SQLite.re
@@ -82,5 +82,5 @@ module Database = {
     "transaction";
 };
 
-[@bs.module "expo-sqlite"] [@bs.scope "SQLite"]
+[@bs.module "expo-sqlite"]
 external openDatabase: string => Database.t = "openDatabase";
diff --git a/packages/reason-expo/src/Svg.re b/packages/reason-expo/src/Svg.re
@@ -167,6 +167,7 @@ module G = {
       ~fill: string=?,
       ~stroke: string=?,
       ~strokeWidth: string=?,
+      ~transform: string=?,
       ~children: React.element=?
     ) =>
     React.element =
@@ -307,4 +308,4 @@ module Pattern = {
     ) =>
     React.element =
     "Pattern";
-};
+};
diff --git a/packages/test/web-build/register-service-worker.js b/packages/test/web-build/register-service-worker.js
@@ -0,0 +1,14 @@
+/* eslint-env browser */
+
+if ('serviceWorker' in navigator) {
+  window.addEventListener('load', function() {
+    navigator.serviceWorker
+      .register('/expo-service-worker.js', { scope: '/' })
+      .then(function(info) {
+        // console.info('Registered service-worker', info);
+      })
+      .catch(function(error) {
+        console.info('Failed to register service-worker', error);
+      });
+  });
+}