From 4164d86e55d1f6986b5ce7da6d3906d5472fc401 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Pryce-=C3=85klundh?=
 <112686610+JPryce-Aklundh@users.noreply.github.com>
Date: Wed, 3 May 2023 13:47:03 +0200
Subject: [PATCH] fix conflict

---
 modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
index 6b586db5b..2442057ea 100644
--- a/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
+++ b/modules/ROOT/pages/tools/neo4j-admin/neo4j-admin-import.adoc
@@ -704,7 +704,7 @@ city03  San Mateo   {latitude:37.554167, longitude:-122.313056, height: 100, crs
 ====
 
 Special considerations for temporal data types::
-The format for all temporal data types must be defined as described in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/syntax/temporal#cypher-temporal-instants[Cypher Manual -> Temporal instants syntax] and link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/syntax/temporal#cypher-temporal-durations[Cypher Manual -> Durations syntax].
+The format for all temporal data types must be defined as described in link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/values-and-types/temporal#cypher-temporal-instants[Cypher Manual -> Temporal instants syntax] and link:{neo4j-docs-base-uri}/cypher-manual/{page-version}/values-and-types/temporal#cypher-temporal-durations[Cypher Manual -> Durations syntax].
 Two of the temporal types, _Time_ and _DateTime_, take a time zone parameter which might be common between all or many of the values in the data file.
 It is therefor possible to specify a default time zone for _Time_ and _DateTime_ values in the header, for example: `time{timezone:+02:00}` and: `datetime{timezone:Europe/Stockholm}`.
 If no default time zone is specified, the default timezone is determined by the `xref:reference/configuration-settings.adoc#config_db.temporal.timezone[db.temporal.timezone]` configuration setting.