remove conflicts

Author: renetapopova

modules/ROOT/pages/tools/cypher-shell.adoc

@@ -63,13 +63,10 @@ The syntax for running Cypher Shell is:
 | Exit and report failures at the end of the input when reading from a file.
 |
 
-<<<<<<< HEAD
-=======
 | --enable-autocompletions
 | Whether to enable Cypher autocompletions inside the CLI, which are disabled by default.
 |
 
->>>>>>> dev
 |--format {auto,verbose,plain}
 |Desired output format. Displays the results in tabular format if you use the shell interactively and with minimal formatting if you use it for scripting. +
 `verbose` displays results in a tabular format and prints statistics. +

publish.yml

@@ -7,11 +7,7 @@ site:
 content:
   sources:
   - url: ./
-<<<<<<< HEAD
     branches: ['3.5', '4.0', '4.1', '4.2', '4.3', '4.4', '5.x']
-=======
-    branches: ['3.5', '4.0', '4.1', '4.2', '4.3', '4.4', 'HEAD']
->>>>>>> dev
     edit_url: https://github.com/neo4j/docs-operations/tree/{refname}/{path}
     exclude:
     - '!**/_includes/*'