Waldemar Brodkorb f14c1fc551 resolve merge conflict 10 lat temu
..
files 9322b52f6d add resolution for lemote yeelong 12 lat temu
Makefile f14c1fc551 resolve merge conflict 10 lat temu