fix:solved merged conflicts

Signed-off-by: pallavicoder <[email protected]>
credebl · May 9, 2024 · cbc4911 · cbc4911
1 parent 440892e
commit cbc4911
Show file tree

Hide file tree

Showing 5 changed files with 2,421 additions and 2,695 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -76,4 +76,3 @@ COPY --from=builder /app/patches ./patches
 
 # Set entry point
 ENTRYPOINT ["node", "./bin/afj-rest.js", "start"]
-
diff --git a/package.json b/package.json
@@ -102,4 +102,4 @@
   "engines": {
     "node": ">=18"
   }
-}
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -76,4 +76,3 @@ COPY --from=builder /app/patches ./patches

		# Set entry point
		ENTRYPOINT ["node", "./bin/afj-rest.js", "start"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,4 +102,4 @@ @@
       "engines": {
         "node": ">=18"
       }
-    }
+    }