mirror of
https://github.com/zadam/trilium.git
synced 2025-12-05 06:54:23 +01:00
334c7dd27a
Some checks failed
Checks / main (push) Has been cancelled
Resolved conflicts by: - Combining imports from both branches in search.ts (added hoistedNoteService and beccaService alongside existing ftsSearchService and log imports) - Integrating FTS5 search optimization from feature branch with flatText attribute search logic from main in note_content_fulltext.ts - Maintained backward compatibility by keeping fallback search implementation for cases where FTS5 is not available or not suitable