diff --git a/src/drivers/webextension/images/icons/Plataforma NEO.svg b/src/drivers/webextension/images/icons/Plataforma NEO.svg
index 559ac6e48..2a9527aa2 100644
--- a/src/drivers/webextension/images/icons/Plataforma NEO.svg
+++ b/src/drivers/webextension/images/icons/Plataforma NEO.svg
@@ -1,16 +1,4 @@
-<<<<<<< HEAD
-=======
-
->>>>>>> dffac961239cb3ed09863b0431d3b758236ee62a
diff --git a/src/technologies.json b/src/technologies.json
index 1e0e17f08..dd9344594 100644
--- a/src/technologies.json
+++ b/src/technologies.json
@@ -1703,7 +1703,11 @@
"headers": {
"X-Confluence-Request-Time": ""
},
- "html": "Powered by ]+atlassian\\.com/software/confluence(?:[^>]+>Atlassian Confluence ([\\d.]+))?\\;version:\\1",
+ "dom": {
+ "li.print-only": {
+ "text": "Atlassian Confluence ([\\d.]+)\\;version:\\1"
+ }
+ },
"icon": "Atlassian Confluence.svg",
"implies": "Java",
"meta": {
@@ -1728,15 +1732,19 @@
13
],
"cpe": "cpe:/a:atlassian:jira",
- "html": "Powered by\\s+]+atlassian\\.com/(?:software/jira|jira-bug-tracking/)[^>]+>Atlassian\\s+JIRA(?:[^v]*v(?:ersion: )?(\\d+\\.\\d+(?:\\.\\d+)?))?\\;version:\\1",
"icon": "Atlassian Jira.svg",
"implies": "Java",
"js": {
- "jira": ""
+ "jira.id": ""
+ },
+ "dom": {
+ "#jira": {
+ "text": ""
+ }
},
"meta": {
- "ajs-version-number": "^(.+)$\\;version:\\1",
- "application-name": "JIRA"
+ "application-name": "JIRA",
+ "data-version": "([\\d.]+)\\;version:\\1\\;confidence:0"
},
"website": "http://www.atlassian.com/software/jira/overview/"
},
@@ -2484,6 +2492,7 @@
"recurring"
],
"saas": true,
+ "pricing": ["low", "freemium", "recurring"],
"website": "http://bubble.io"
},
"BugSnag": {
@@ -18437,4 +18446,4 @@
"website": "https://www.xt-commerce.com"
}
}
-}
\ No newline at end of file
+}