rm compose

wikipathways · Apr 19, 2024 · bb7733b · bb7733b
1 parent 9db5c89
commit bb7733b
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,12 +6,7 @@ services:
     restart: always
     container_name: wikipathways-virtuoso
     volumes:
-<<<<<<< HEAD
       - VIRTUOSO_DB_PERSISTENT_DIR:/database # directory to persist the Virtuoso database. If empty dir, a new database will be created
-=======
-      - /home/MarvinMartens/snorql-extended/import:/import # directory where RDF files are located to be imported into Virtuoso
-      - /home/MarvinMartens/snorql-extended/data:/opt/virtuoso-opensource/database # directory to persist the Virtuoso database
->>>>>>> f590609 (docker compose for wikipathways service)
     environment:
       - DBA_PASSWORD=dbaisapasswordthatshouldbeupdated
       - SPARQL_UPDATE=false