Fixed conflict. - snac2 - Fork of https://codeberg.org/grunfink/snac2

commit 09036893c0cc7ad3d25562e91c574f42da675b1d
parent aba9a69aa67adec362c005da95c65f2b7186b797
Author: default <nobody@localhost>
Date:   Fri,  2 Dec 2022 06:53:11 +0100

Fixed conflict.

	snac2 Fork of https://codeberg.org/grunfink/snac2
	git clone https://git.inz.fi/snac2
	Log \| Files \| Refs \| README \| LICENSE