local-it/recipes
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove merge leftovers

Browse source
This commit is contained in:
knoflook 2022-11-30 17:54:12 +01:00
parent 481149fb5c
commit eceebc71d4
No known key found for this signature in database
GPG key ID: D6A1D0E8FC4FEF1C
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
recipes.json
View file

@ -866,11 +866,6 @@
"tag": "13-alpine" "tag": "13-alpine"
}, },
"redis": { "redis": {
<<<<<<< HEAD
"digest": "3358aea",
||||||| 1387275
"digest": "f8528f1",
=======
"digest": "3358aea", "digest": "3358aea",
"image": "redis", "image": "redis",
"tag": "7.0-alpine" "tag": "7.0-alpine"