2 Commits

Author	SHA1	Message	Date
Christian König	12674c0824	Shorten no merge conflict message ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-12-22 22:27:03 +01:00
Christian König	7562376373	Add merge-conflict workflow ... Signed-off-by: Christian König <ckoenig@posteo.de>	2022-12-17 21:14:20 +01:00