fixing merge conflicts

uktrade · Jan 27, 2025 · df2ce9f · df2ce9f
2 parents 2cc4508 + c251130
commit df2ce9f
Show file tree

Hide file tree

Showing 5 changed files with 568 additions and 542 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -53,6 +53,7 @@ services:
 
   redis:
     image: redis:7.4.1
+    command: ["redis-server", "--save", ""]  # Disable RDB snapshot saving
     ports:
       - "6379:6379"
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,7 @@ services: @@
       redis:
         image: redis:7.4.1
+        command: ["redis-server", "--save", ""]  # Disable RDB snapshot saving
         ports:
           - "6379:6379"
@@ Expand Down @@