From ba5d5685b9253529a940d6c5c8453ada0090c822 Mon Sep 17 00:00:00 2001 From: widlam Date: Fri, 29 Dec 2023 12:56:28 +0100 Subject: [PATCH] Fixed tooltips merge conflicts --- Frontend/src/assets/tooltips/xpath/xpathdiffs.json | 8 -------- Frontend/src/assets/tooltips/xslt/xsltdiffs.json | 4 ---- 2 files changed, 12 deletions(-) diff --git a/Frontend/src/assets/tooltips/xpath/xpathdiffs.json b/Frontend/src/assets/tooltips/xpath/xpathdiffs.json index 2a9794e..5e0be75 100644 --- a/Frontend/src/assets/tooltips/xpath/xpathdiffs.json +++ b/Frontend/src/assets/tooltips/xpath/xpathdiffs.json @@ -2,19 +2,11 @@ "universalInfo": [ { -<<<<<<< HEAD - "category":"What is XPath", - "description":"XPath is a query language used for selecting nodes from XML and processing them. It may perform operations on strings, numbers and boolean values." - }, - { - "category":"What's new in XPath?" -======= "category":"What is XPath?", "description":"XPath is a query language used for selecting nodes from XML and processing them. It may perform operations on strings, numbers and boolean values." }, { "category":"What's new in XPath" ->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0 } ], "VersionDiffs": diff --git a/Frontend/src/assets/tooltips/xslt/xsltdiffs.json b/Frontend/src/assets/tooltips/xslt/xsltdiffs.json index 1ce9471..1d94507 100644 --- a/Frontend/src/assets/tooltips/xslt/xsltdiffs.json +++ b/Frontend/src/assets/tooltips/xslt/xsltdiffs.json @@ -6,11 +6,7 @@ "description":"XSLT (Extensible Stylesheet Language Transformations) is a language for converting and manipulating XML data into various formats. It uses rules defined in stylesheets to transform XML documents into HTML, XML, or other text-based outputs." }, { -<<<<<<< HEAD - "category":"What's differences between XSLT versions" -======= "category":"Differences between XSLT versions" ->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0 } ], "VersionDiffs":