fix merge
authorAlan Knowles <alan@roojs.com>
Sat, 20 Jan 2024 16:57:40 +0000 (00:57 +0800)
committerAlan Knowles <alan@roojs.com>
Sat, 20 Jan 2024 16:57:40 +0000 (00:57 +0800)
commit6acc1bf9b9a671ed7ac6e5f70fb1762a3a4cdc4c
tree72bf1060c8fdb1861e5eb25704ae0bdc50360073
parent356b06c19b0fb2994b222ce36428a45ac2921b90
fix merge
src/Builder4/DialogConfirm.bjs
src/Builder4/DialogConfirm.vala
src/Builder4/DialogFiles.bjs
src/Builder4/DialogFiles.vala
src/JsRender/Node.vala
src/Spawn.vala