missed file

carnival-data · Jul 4, 2024 · 6c08c36 · 6c08c36
1 parent ebf9df4
commit 6c08c36
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/app/gradle.properties b/app/gradle.properties
@@ -11,11 +11,7 @@ gremlinVersion=3.7.2
 javaVersion=21
 # carnival
 carnivalGroup=io.github.carnival-data
-<<<<<<< HEAD
-carnivalVersion=4.0.0-SNAPSHOT
-=======
 carnivalVersion=5.0.1-SNAPSHOT
->>>>>>> 5.0.x-neo4j-remove
 
 #When using Docker, these values are set for docker-compose in ../.env
 #If not using Docker, set these values in another gradle.properties in your home directory