mirror of
https://github.com/penpot/penpot.git
synced 2026-10-29 05:50:35 +00:00
6ab7b3ebd6
Both conflicts are tail appends onto regions develop rewrote. In migrations.clj keep both appended blocks, develop's two entries first so the branch's four stay the tail of the vector. In climit.edn take develop's rewritten entries and re-append the branch's provisional block, moving the map's closing brace to the last line. AI-assisted-by: glm-5.3-flash Signed-off-by: Álvaro Tejero Cantero <alvorithm@teje.ro>