merge conflict

philkrie · philkrie · commit 66d349cb8f36 · 2019-05-22T18:14:25.000-07:00
diff --git a/extended_apps.json b/extended_apps.json
@@ -454,8 +454,12 @@
             "reference": "https://www.ampproject.org/learn/overview/"
         }
     },
-    "incompatibleCategoryTooltips": {
-        "52": "A chat feature would have to be reserved for another part of your site. Currently not possible within an AMP page"
+    "Branch": {
+      "cats": [10],
+      "html": "cdn\\.branch\\.io/",
+      "icon": "Branch.png",
+      "website": "https://branch.io/",
+      "extended": true
     },
     "technologyTooltips": {
         "jQuery": "jQuery is a very common JS library that is used for convenience, but doesn't enable anything that can't be accomplished with AMP JS",
@@ -590,4 +594,4 @@
             "link": "https://blog.optimizely.com/2019/04/18/optimizely-google-amp/"
         }
 	}
-}
+}
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "webextension-polyfill": "^0.2.1",
-    "jquery": "^3.3.1",
-    "jquery-ui-dist": "^1.12.1"
+    "webextension-polyfill": "0.4.0",
+    "jquery": "3.4.1",
+    "jquery-ui-dist": "1.12.1"
   }
 }
diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "config:base"
+  ]
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +  "extends": [
 +    "config:base"
 +  ]
 +}