Merge branch 'main' of https://git.coopcloud.tech/coop-cloud/recipes-catalogue-json

2022-11-30 17:52:41 +01:00 · 2022-11-30 17:52:41 +01:00 · 481149fb5c
commit 481149fb5c
parent ee8a7dde37 08d4a82a23
1 changed files with 6 additions and 6 deletions
--- a/recipes.json
+++ b/recipes.json
@ -866,6 +866,11 @@
                        "tag": "13-alpine"
                    },
                    "redis": {
+<<<<<<< HEAD
+                        "digest": "3358aea",
+||||||| 1387275
+                        "digest": "f8528f1",
+=======
                        "digest": "3358aea",
                        "image": "redis",
                        "tag": "7.0-alpine"
@ -891,11 +896,6 @@
                    },
                    "redis": {
                        "digest": "3358aea",
-                        "image": "redis",
-                        "tag": "7.0-alpine"
-                    },
-                    "sidekiq": {
-                        "digest": "6cce2cf",
                        "image": "bitnami/discourse",
                        "tag": "2.8.9"
                    }
@ -5690,4 +5690,4 @@
        "versions": [],
        "website": "https://github.com/znc/znc"
    }
-}
+}