R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Fixed tooltips merge conflicts

Browse Source
This commit is contained in:
Mikolaj Widla
2023-12-29 12:56:28 +01:00
parent e8b22a41c6
commit ba5d5685b9
2 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Frontend/src/assets/tooltips/xpath/xpathdiffs.json
View File

@@ -2,19 +2,11 @@
"universalInfo": "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?", "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." "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's new in XPath"
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
} }
], ],
"VersionDiffs": "VersionDiffs":

4
Frontend/src/assets/tooltips/xslt/xsltdiffs.json
View File

@@ -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." "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" "category":"Differences between XSLT versions"
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
} }
], ],
"VersionDiffs": "VersionDiffs":