mirror of
https://github.com/logseq/logseq.git
synced 2026-05-27 14:14:24 +00:00
4bf2430b02
Three manual conflict resolutions, applied via Python to bypass the
auto-formatter (which corrupts cond-> map literals when invoked on
files containing conflict markers):
- block.cljs: take master's nil-safe `(when ext ...)` guard on the
electron asset-ref path and master's `:class "ls-block-content-indent"`
in place of the inline `:style {:padding-left ...}`. Our prior
20-default icon-size fix is preserved (auto-merged cleanly).
- cmdk/core.cljs: take master's `:block.temp/unique-title` worker-
precomputed field for `page-item` and `block-item`; drop our dead
`:ignore-current-icon?` opt.
- content.cljs: take master's new "Copy block URL" + "Show asset in
folder" dropdown items (the `(when (util/electron?))` block was
refactored to use `get-logseq-web-block-url` + `current-graph-id`).
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>