fix merge
authorAlan Knowles <alan@roojs.com>
Mon, 29 Jan 2024 11:02:32 +0000 (19:02 +0800)
committerAlan Knowles <alan@roojs.com>
Mon, 29 Jan 2024 11:02:32 +0000 (19:02 +0800)
commit341a0c1fb636275be75423b4ff69c069b27b5ba2
treeb95ba1ddca1f8f46cb3c2384f900f08a0264a390
parent042e9d4a0fbdacac933b2a2df0625b7ba4bd7674
fix merge
.roobuilder.jcfg
src/Application.vala
src/Builder4/Editor.bjs
src/Builder4/Editor.vala
src/Builder4/WindowLeftProps.bjs
src/Builder4/WindowLeftProps.vala
src/Builder4/WindowLeftTree.bjs
src/Builder4/WindowLeftTree.vala