fix merge
authorAlan <alan@roojs.com>
Tue, 2 Jan 2024 10:56:15 +0000 (18:56 +0800)
committerAlan <alan@roojs.com>
Tue, 2 Jan 2024 10:56:15 +0000 (18:56 +0800)
commitdeecf1e4dc1b600273ebf4f62c517e194710d0b9
tree5111b5f2e3203a17d0d54c5b543c3c2e2beeee7d
parentf2eb1fff9440f2eb5fe0ee76381414dd305b6ff9
fix merge
src/JsRender/JsonGen.vala
src/JsRender/NodeToVala.vala
src/JsRender/Roo.vala
src/Palete/Gir.vala
src/Palete/Gtk.vala
src/Palete/VapiParser.vala
src/codegen/valaccodeassignmentmodule.vala