fix merge
authorAlan <alan@roojs.com>
Tue, 28 Jun 2022 09:27:27 +0000 (17:27 +0800)
committerAlan <alan@roojs.com>
Tue, 28 Jun 2022 09:27:27 +0000 (17:27 +0800)
commit3907c398cccb7fcecaeafb71aac930222677bd50
treeb023e0fe9cdbdd391970efcf889535d2946eee16
parent5ea668ede55bff146263e1e34830a1fe4f1f6ca7
fix merge
src/Builder4/PopoverAddProp.bjs
src/Builder4/PopoverAddProp.vala
src/Palete/Roo.vala