fix merges
authorAlan Knowles <alan@roojs.com>
Sat, 20 Jan 2024 17:23:29 +0000 (01:23 +0800)
committerAlan Knowles <alan@roojs.com>
Sat, 20 Jan 2024 17:23:29 +0000 (01:23 +0800)
commit597501a805771da231dbd77e795d0cd949c3f51f
treed617c001ad4fad7ea1c5f9b5dd7a126152cd0e10
parenteccffa50a972ff9cefeab353a5fede2d3f75564c
fix merges
src/Builder4/DialogConfirm.bjs
src/Builder4/DialogConfirm.vala
src/Builder4/DialogFiles.bjs
src/Builder4/DialogFiles.vala
src/Builder4/Editor.bjs
src/Builder4/Editor.vala
src/JsRender/Node.vala
src/JsRender/NodeProp.vala
src/Palete/LanguageClientJavascript.vala
src/Spawn.vala