remove merge leftovers

2022-11-30 17:54:12 +01:00 · 2022-11-30 17:54:12 +01:00 · eceebc71d4
commit eceebc71d4
parent 481149fb5c
1 changed files with 0 additions and 5 deletions
--- a/recipes.json
+++ b/recipes.json
@ -866,11 +866,6 @@
                        "tag": "13-alpine"
                    },
                    "redis": {
-<<<<<<< HEAD
-                        "digest": "3358aea",
-||||||| 1387275
-                        "digest": "f8528f1",
-=======
                        "digest": "3358aea",
                        "image": "redis",
                        "tag": "7.0-alpine"