From 539bb8edc763235aaccfb2540c8c7e4124f08331 Mon Sep 17 00:00:00 2001
From: Matt Hobbs <matt@nooshu.com>
Date: Wed, 16 Sep 2020 15:18:45 +0100
Subject: [PATCH 1/2] Resolve merge conflicts

---
 src/technologies.json | 62 +++++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index 3e02ec115..f804d6fd6 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -4808,18 +4808,70 @@
       "icon": "G-WAN.png",
       "website": "http://gwan.com"
     },
+    "GOV.UK Elements": {
+      "cats": [
+        66
+      ],
+      "html": [
+        "<link[^>]+elements-page[^>\"]+css\\;confidence:25",
+        "<div[^>]+phase-banner-alpha\\;confidence:25",
+        "<div[^>]+phase-banner-beta\\;confidence:25",
+        "<div[^>]+govuk-box-highlight\\;confidence:25"
+      ],
+      "implies": "GOV.UK Toolkit",
+      "icon": "govuk.png",
+      "website": "https://github.com/alphagov/govuk_elements/"
+    },
     "GOV.UK Frontend": {
       "cats": [
-        66,
-        19
+        66
       ],
       "html": [
-        "<body[^>]+govuk-template__body",
-        "<a[^>]+govuk-link"
+        "<link[^>]* href=[^>]*?govuk-frontend(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.css\\;version:\\1?a:",
+        "<body[^>]+govuk-template__body\\;confidence:80",
+        "<a[^>]+govuk-link\\;confidence:10"
+      ],
+      "js": {
+        "window.GOVUKFrontend": ""
+      },
+      "scripts": [
+        "govuk-frontend(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.js\\;version:\\1?a:"
       ],
       "icon": "govuk.png",
       "website": "https://design-system.service.gov.uk/"
     },
+    "GOV.UK Template": {
+      "cats": [
+        66
+      ],
+      "html": [
+        "<link[^>]+govuk-template[^>\"]+css",
+        "<link[^>]+govuk-template-print[^>\"]+css",
+        "<link[^>]+govuk-template-ie6[^>\"]+css",
+        "<link[^>]+govuk-template-ie7[^>\"]+css",
+        "<link[^>]+govuk-template-ie8[^>\"]+css"
+      ],
+      "js": {
+        "window.GOVUK": ""
+      },
+      "scripts": [
+        "govuk-template\\.js"
+      ],
+      "icon": "govuk.png",
+      "website": "https://github.com/alphagov/govuk_template/"
+    },
+    "GOV.UK Toolkit": {
+      "cats": [
+        66
+      ],
+      "js": {
+        "window.GOVUK.primaryLinks": "",
+        "window.GOVUK.details": "",
+        "window.GOVUK.modules": ""
+      },
+      "icon": "govuk.png",
+      "website": "https://github.com/alphagov/govuk_frontend_toolkit"
+    },
     "GSAP": {
       "cats": [
         12
@@ -16163,4 +16215,4 @@
       "website": "https://www.xt-commerce.com"
     }
   }
-}
\ No newline at end of file
+}

From eb203079c57b0c7d21d9b4daf19f2681e586f4c4 Mon Sep 17 00:00:00 2001
From: Elbert Alias <77259+AliasIO@users.noreply.github.com>
Date: Fri, 18 Sep 2020 07:49:57 +1000
Subject: [PATCH 2/2] Update technologies.json

Remove `window.` references.
---
 src/technologies.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/technologies.json b/src/technologies.json
index f804d6fd6..b0c823343 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -4832,7 +4832,7 @@
         "<a[^>]+govuk-link\\;confidence:10"
       ],
       "js": {
-        "window.GOVUKFrontend": ""
+        "GOVUKFrontend": ""
       },
       "scripts": [
         "govuk-frontend(?:[^>]*?([0-9a-fA-F]{7,40}|[\\d]+(?:.[\\d]+(?:.[\\d]+)?)?)|)[^>]*?(?:\\.min)?\\.js\\;version:\\1?a:"
@@ -4852,7 +4852,7 @@
         "<link[^>]+govuk-template-ie8[^>\"]+css"
       ],
       "js": {
-        "window.GOVUK": ""
+        "GOVUK": ""
       },
       "scripts": [
         "govuk-template\\.js"
@@ -4865,9 +4865,9 @@
         66
       ],
       "js": {
-        "window.GOVUK.primaryLinks": "",
-        "window.GOVUK.details": "",
-        "window.GOVUK.modules": ""
+        "GOVUK.primaryLinks": "",
+        "GOVUK.details": "",
+        "GOVUK.modules": ""
       },
       "icon": "govuk.png",
       "website": "https://github.com/alphagov/govuk_frontend_toolkit"
@@ -7452,7 +7452,7 @@
       },
       "icon": "Loja Integrada.png",
       "js": {
-        "window.LOJA_ID": ""
+        "LOJA_ID": ""
       },
       "website": "https://lojaintegrada.com.br/"
     },
@@ -7773,7 +7773,7 @@
       "description": "Matomo Tag Manager manages tracking and marketing tags.",
       "icon": "Matomo.png",
       "js": {
-        "window.MatomoTagManager": ""
+        "MatomoTagManager": ""
       },
       "website": "https://developer.matomo.org/guides/tagmanager/introduction"
     },