From c6213b3c203580ec719bb62641f86d9ead457ecc Mon Sep 17 00:00:00 2001 From: MaggieAppleton <5599295+MaggieAppleton@users.noreply.github.com> Date: Sun, 22 Oct 2023 16:45:30 +0800 Subject: [PATCH] fixed merge conflict --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5862857..509d04e 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ See the [Theory, Philosophy, and Navel-gazing](https://github.com/MaggieAppleton - [Neuron](https://github.com/srid/neuron) - Managing and publishing system for plain-text Zettelkasten-style notes. - [Innos Notes](https://innos.io/) – Features include parallel pages, content blocks, and knowledge graph visualisations. - [Trilium Notes](https://github.com/zadam/trilium) - A hierarchical note taking application with focus on building large personal knowledge bases. +- [Quartz](https://quartz.jzhao.xyz/) - Publish your Obsidian or Roam digital garden to the web for free. Includes full-text search, graph visualization, and backlinks. #### Building a Private Garden @@ -157,6 +158,7 @@ See the [Theory, Philosophy, and Navel-gazing](https://github.com/MaggieAppleton | [Soren Bjornstad](https://zettelkasten.sorenbjornstad.com) | TiddlyWiki + homegrown scripts | Almost everything; emphasis on tech, reading, and how to live | | [Paul Batchelor](https://pbat.ch/wiki) | [WeeWiki](https://pbat.ch/wiki/weewiki) | Computer Music, Audio Programming, Literate Programming, Food | | [Memento](https://m0wer.github.io/memento/) | [MkDocs](https://www.mkdocs.org/), [MkDocs Newsletter](https://lyz-code.github.io/mkdocs-newsletter/) | Python, GNU/Linux, DevOps, Flutter, traveling, cooking, ...| +| [Jacky Zhao](https://garden.jzhao.xyz) | [Quartz](https://quartz.jzhao.xyz) | Books, Cognitive Sciences, Education, Technology, and whatever else I happen to be reading | ## Other digital garden compilations: @@ -164,3 +166,4 @@ See the [Theory, Philosophy, and Navel-gazing](https://github.com/MaggieAppleton * [Richard Litt's compilation](https://github.com/RichardLitt/meta-knowledge) * [KasperZutterman's compilation](https://github.com/KasperZutterman/Second-Brain) * [Best-of Digital Gardens](https://github.com/lyz-code/best-of-digital-gardens) +