fix merge conflict

charted-dev · Feb 11, 2024 · 15c5823 · 15c5823
2 parents 0c5f5d1 + 07ab37a
commit 15c5823
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 75 deletions.
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -28,7 +28,7 @@ services:
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
     postgres:
-        image: bitnami/postgresql:15.5.0
+        image: bitnami/postgresql:15.6.0
         restart: unless-stopped
         environment:
             - POSTGRESQL_DATABASE=charted

diff --git a/Cargo.lock b/Cargo.lock