OpenSource/AFFiNE
1
0 Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

feat(core): journal sidebar conflict block (#5574)

Browse Source
This commit is contained in:
Cats Juice committed 2024-01-18 14:05:15 +00:00
1 parent 7aaec3ad51
commit f4b26a16f8
3 files changed
+177 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/frontend/i18n/src/resources/en.json
+2 -1
View File
@@ -1047,5 +1047,6 @@
"com.affine.journal.created-today": "Created today",
"com.affine.journal.updated-today": "Updated today",
"com.affine.journal.daily-count-created-empty-tips": "You haven't created anything yet",
"com.affine.journal.daily-count-updated-empty-tips": "You haven't updated anything yet"
"com.affine.journal.daily-count-updated-empty-tips": "You haven't updated anything yet",
"com.affine.journal.conflict-show-more": "{{count}} more articles"
}