Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Vanessa 2023-07-13 21:43:01 +08:00
commit 7822e66ce4
2 changed files with 13 additions and 10 deletions

View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20210721112206-mhr9wxi",
"title": "Data sync",
"updated": "20230220103712"
"updated": "20230713213257"
},
"Children": [
{
@ -92,7 +92,7 @@
"ListData": {},
"Properties": {
"id": "20220708103812-eil2e26",
"updated": "20220708103847"
"updated": "20230713213257"
},
"Children": [
{
@ -155,7 +155,7 @@
},
"Properties": {
"id": "20220708103815-su0ak6i",
"updated": "20220708103847"
"updated": "20230713213257"
},
"Children": [
{
@ -163,12 +163,15 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20220708103815-2rl1hd5",
"updated": "20220708103847"
"updated": "20230713213257"
},
"Children": [
{
"Type": "NodeText",
"Data": "Ignore files"
"Type": "NodeTextMark",
"TextMarkType": "block-ref",
"TextMarkBlockRefID": "20210928101257-l27t5uo",
"TextMarkBlockRefSubtype": "s",
"TextMarkTextContent": "Ignore files"
}
]
}

View file

@ -5,7 +5,7 @@
"Properties": {
"id": "20211226122707-8cr09co",
"title": "資料歷史",
"updated": "20230630141949"
"updated": "20230713213240"
},
"Children": [
{
@ -1680,7 +1680,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226121454-03u8yy2",
"updated": "20211228135319"
"updated": "20230713213240"
},
"Children": [
{
@ -1690,11 +1690,11 @@
{
"Type": "NodeTextMark",
"TextMarkType": "code",
"TextMarkTextContent": " 工作空間/data/.siyuan/syncignore"
"TextMarkTextContent": "工作空間/data/.siyuan/syncignore"
},
{
"Type": "NodeText",
"Data": " 其中每一行使用 data 文件夾的相對路徑進行配置,表示忽略文件或文件夾的路徑,支援通配符。例如:"
"Data": " 其中每一行使用 data 文件夾的相對路徑進行配置,表示忽略文件或文件夾的路徑,支援通配符。例如:"
}
]
},