resolve merge conflicts

This commit is contained in:
Marco Ochse 2024-04-19 18:20:39 +02:00
commit 35d68c88cd

View file

@ -38,6 +38,6 @@ keywords:
- docker
- elk
license: GPL-3.0
commit: unreleased, under heavy development
commit: release
version: 24.04.0
date-released: '2024-04-22'
date-released: '2024-04-22'