conflict fix

NataliaIvakina · JPryce-Aklundh · commit 2a7245269235 · 2023-03-22T11:03:47.000+01:00
diff --git a/antora.yml b/antora.yml
@@ -8,9 +8,9 @@ asciidoc:
   attributes:
     page-origin-private: false
     neo4j-version: '5'
-    neo4j-version-minor: '5.5'
-    neo4j-version-exact: '5.5.0'
-    neo4j-buildnumber: '5.5'
+    neo4j-version-minor: '5.6'
+    neo4j-version-exact: '5.6.0'
+    neo4j-buildnumber: '5.6'
     neo4j-ogm-version: '4.0.1'
     java-driver-version: '5.6.0'
     javascript-driver-version: '5.6.0'
diff --git a/modules/ROOT/pages/index.adoc b/modules/ROOT/pages/index.adoc
@@ -1,5 +1,4 @@
 :page-ogdescription: The Neo4j Getting Started Guide covers: How to get started with Neo4j. Introduction to graph database concepts and introduction to the graph query language Cypher.
-:neo4j-version-minor: 5.5
 :page-ad-overline-link: https://graphacademy.neo4j.com/categories/?ref=docs
 :page-ad-overline: Neo4j GraphAcademy
 :page-ad-title: Neo4j GraphAcademy Courses

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`:page-ogdescription: The Neo4j Getting Started Guide covers: How to get started with Neo4j. Introduction to graph database concepts and introduction to the graph query language Cypher.`
`2`		`-:neo4j-version-minor: 5.5`
`3`	`2`	`:page-ad-overline-link: https://graphacademy.neo4j.com/categories/?ref=docs`
`4`	`3`	`:page-ad-overline: Neo4j GraphAcademy`
`5`	`4`	`:page-ad-title: Neo4j GraphAcademy Courses`