vault backup: 2025-08-08 18:05:09

This commit is contained in:
CrazyJasonwell
2025-08-08 18:05:09 +08:00
parent c7b872a34e
commit 8b40098964
8 changed files with 28 additions and 51 deletions

Binary file not shown.

View File

@@ -1,4 +1,4 @@
{
"folders": "._*\n",
"enable": true
"enable": false
}

View File

@@ -5,8 +5,20 @@
"path": "01-工作日记/2025-08-08.md"
},
{
"basename": "conflict-files-obsidian-git",
"path": "conflict-files-obsidian-git.md"
"basename": "2025-08-04",
"path": "01-工作日记/2025-08-04.md"
},
{
"basename": "2025-08-03",
"path": "01-工作日记/2025-08-03.md"
},
{
"basename": "2025-08-01",
"path": "01-工作日记/2025-08-01.md"
},
{
"basename": "README",
"path": "README.md"
},
{
"basename": "mac 安装及使用docker_docker for mac-CSDN博客",
@@ -187,18 +199,6 @@
{
"basename": "Docker系列 安装个人RSS服务TTRSS 手机完美适配 - 知乎",
"path": "10-WebClipper/Docker系列 安装个人RSS服务TTRSS 手机完美适配 - 知乎.md"
},
{
"basename": "PKMer_PARA 信息组织法 — 如何整理我的数字信息",
"path": "10-WebClipper/PKMer_PARA 信息组织法 — 如何整理我的数字信息.md"
},
{
"basename": "2025-08-04",
"path": "01-工作日记/2025-08-04.md"
},
{
"basename": "Draft202508",
"path": "08-Inbox/Draft202508.md"
}
],
"omittedPaths": [],

File diff suppressed because one or more lines are too long

View File

@@ -299,14 +299,18 @@
"password-protection:开启密码保护": false,
"soundscapes:Soundscapes: My Music": false,
"sheet-plus:创建 Excel 文件": false,
"hidden-folder-obsidian:显示文件夹": false,
"periodic-notes:Open today": false
}
},
"active": "b30dd120f71be716",
"lastOpenFiles": [
"conflict-files-obsidian-git.md",
"01-工作日记/2025-08-04.md",
"01-工作日记/2025-08-03.md",
"01-工作日记/2025-08-01.md",
"README.md",
"欢迎.md",
"01-工作日记/2025-08-08.md",
"conflict-files-obsidian-git.md",
"03-学习笔记/Docker/mac 安装及使用docker_docker for mac-CSDN博客.md",
"03-学习笔记/Docker/如何在Docker中,修改已经挂载的卷(Volume).md",
"03-学习笔记/Docker/Mac使用docker时,卷默认挂载路径-var-lib-docker-volumes不存在问题_mac docker 卷默认挂载路径不存在-CSDN博客.md",
@@ -326,12 +330,7 @@
"20-我的收藏夹/21-浏览器收藏/Favorites/Applehub心动 IOS免费软件源轻松签全能签喵喵签软件源IPA下载Mac软件.md",
"20-我的收藏夹/21-浏览器收藏/Favorites/快速安装Homebrew教程 - Homebrew 中文网.md",
"20-我的收藏夹/21-浏览器收藏/Favorites/Mac和iOS最佳免费工具App集合 - Oka Apps.md",
"20-我的收藏夹/21-浏览器收藏/Favorites/Greasy Fork - 安全、实用的用户脚本大全.md",
"20-我的收藏夹/21-浏览器收藏/ClipperBox",
"20-我的收藏夹/21-浏览器收藏/Favorites/Float Tech, LLC - (Developer) — AppAgg.md",
"20-我的收藏夹/21-浏览器收藏/Favorites/ios云盘ipa资源网站ios插件资源.md",
"20-我的收藏夹/21-浏览器收藏/Favorites/数码荔枝 - 专注于分享最新鲜优秀的正版软件.md",
"20-我的收藏夹/21-浏览器收藏/Favorites/azw3_mobi_epub_kindle电子书免费下载_爱悦读网.md",
"20-我的收藏夹/21-浏览器收藏/Favorites",
"未命名 1.canvas",
"未命名.canvas",

View File

@@ -25,7 +25,7 @@ https://www.chenqiang1986.cn/index.php/2024/12/02/omnivore%e7%a7%81%e6%9c%89%e5%
- 学习raindrop:设置一个ClipperBox用于存放之后Highlights,浏览器插件保存,同步到OB,raindrop在浏览器部分可以进行批注和多次高亮设置,OB部分可以看到高亮域!帅!
- Edge:整理集锦,集锦就是edge的阅读列表(稍后阅读)
- OB:windows会产生一些._*文件,很恶心!
- OB:Mac会产生一些._*文件,很恶心!只要往windows传送文件。。。
-
## 3 Tips
- Unix与WIndows:在Mac下编辑的脚本不能直接在Windows使用,换行和字符集不一样,调试时才想起来!

View File

@@ -1,17 +0,0 @@
# Conflicts
Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
(This file will automatically be deleted before commit)
[[#Additional Instructions]] available below file list
- Not a file: .obsidian/workspace.json
# Additional Instructions
I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
```diff
<<<<<<< HEAD
File changes in local repository
=======
File changes in remote repository
>>>>>>> origin/main
```

View File

@@ -1,5 +0,0 @@
这是你的新*仓库*。
写点笔记,[[创建链接]],或者试一试[导入器](https://help.obsidian.md/Plugins/Importer)插件!
当你准备好了,就将该笔记文件删除,使这个仓库为你所用。