remove conflict markers

andrefs · Jul 26, 2023 · 08e34c7 · 08e34c7
1 parent 23f6dcc
commit 08e34c7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,21 +8,12 @@ services:
     # scale: 3
     depends_on:
       - pubsub
-<<<<<<< Updated upstream
       - database
     networks:
       - ps
       - db
     environment:
       MONGODB_HOST: database
-=======
-      - db
-    networks:
-      - pubsub
-      - database
-    environment:
-      MONGODB_HOST: db
->>>>>>> Stashed changes
       REDIS_HOST: pubsub
       MAX_PATH_LENGTH: '${MAX_PATH_LENGTH}'
       MAX_PATH_PROPS: '${MAX_PATH_PROPS}'
@@ -57,13 +48,10 @@ services:
     ports:
       - '3000:3000'
       - '5432:5432'
-<<<<<<< Updated upstream
   database:
-=======
-  db:
->>>>>>> Stashed changes
     image: mongo
-    restart: unless-stopped
+    restart:
+      unless-stopped
       #environment:
       #  MONGO_INITDB_ROOT_USERNAME_FILE: /run/secrets/MONGODB_USER
       #  MONGO_INITDB_ROOT_PASSWORD_FILE: /run/secrets/MONGODB_PASS

diff --git a/src/manager/lib/ProcessManager.ts b/src/manager/lib/ProcessManager.ts
@@ -143,11 +143,7 @@ app.post('/processes', async (req, res) => {
     },
     seeds: uniqueSeeds,
   });
-<<<<<<< Updated upstream
   await Process.startNext();
-=======
-  //await Process.startNext();
->>>>>>> Stashed changes
   res.redirect(303, '/processes/' + p.pid);
 });
 

diff --git a/src/models/Path.ts b/src/models/Path.ts
@@ -9,10 +9,6 @@ export interface PathSkeleton {
   predicates: { elems: string[] };
   nodes: { elems: string[] };
   parentPath: IPath;
-<<<<<<< Updated upstream
-=======
-  processId: string;
->>>>>>> Stashed changes
 }
 
 export interface IPath {
@@ -34,10 +30,6 @@ export interface IPath {
     needsCrawling: boolean;
   };
   parentPath: Types.ObjectId;
-<<<<<<< Updated upstream
-=======
-  processId: string;
->>>>>>> Stashed changes
   status:
   | 'active'
   | 'disabled' // a better alternative path was found