fix

neo4j · Nov 21, 2023 · fa91c6e · fa91c6e
1 parent be228dd
commit fa91c6e
Showing 1 changed file with 0 additions and 12 deletions.
diff --git a/modules/ROOT/pages/styleguide.adoc b/modules/ROOT/pages/styleguide.adoc
@@ -374,27 +374,15 @@ RETURN count(vehicle)
 .Bad
 [source, cypher, indent=0]
 ----
-<<<<<<< HEAD
-CREATE (a:End {prop: 42}),
-       (b:End {prop: 3}),
-       (c:Begin {prop: id(a)})
-=======
 MATCH (kate:Person {name: 'Kate'})-[r:LIKES]-(c:Car)
 RETURN c.type
->>>>>>> e06eda8 ( Replaced deprecated pattern (#780))
 ----
 +
 .Good
 [source, cypher, indent=0]
 ----
-<<<<<<< HEAD
-CREATE (a:End {prop: 42}),
-       (:End {prop: 3}),
-       (:Begin {prop: id(a)})
-=======
 MATCH (:Person {name: 'Kate'})-[:LIKES]-(c:Car)
 RETURN c.type
->>>>>>> e06eda8 ( Replaced deprecated pattern (#780))
 ----
 
 * Chain patterns together to avoid repeating variables.