Skip to content

Commit 1f900bd

Browse files
JusterZhuclaude
andcommitted
fix: resolve merge conflicts in cookbook UAC notes across 3 locales
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2 parents 52b55bf + 63a02ba commit 1f900bd

3 files changed

Lines changed: 0 additions & 3 deletions

File tree

website/docs/quickstart/Beginner cookbook.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,6 @@ Client (新版本):
391391
> **提示**:如果在更新时遇到"权限不足"或 UAC 弹窗,请检查应用是否安装在不推荐的目录中。将应用迁移到用户目录通常可以解决此问题。
392392
393393
## 示例仓库
394-
395394
| 仓库 | 地址 |
396395
| --- | --- |
397396
| Samples(Server + Hub) | [GeneralUpdate-Samples](https://github.com/GeneralLibrary/GeneralUpdate-Samples) |

website/i18n/en/docusaurus-plugin-content-docs/current/quickstart/Beginner cookbook.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ The update process requires read/write access to the application directory. To a
393393
> **Tip**: If you encounter "Access Denied" or UAC prompts during updates, check whether the application is installed in a non-recommended directory. Moving the application to a user directory usually resolves the issue.
394394
395395
## Sample repositories
396-
397396
| Repository | URL |
398397
| --- | --- |
399398
| Samples (Server + Hub) | [GeneralUpdate-Samples](https://github.com/GeneralLibrary/GeneralUpdate-Samples) |

website/i18n/zh-Hans/docusaurus-plugin-content-docs/current/quickstart/Beginner cookbook.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,6 @@ Client (新版本):
391391
> **提示**:如果在更新时遇到"权限不足"或 UAC 弹窗,请检查应用是否安装在不推荐的目录中。将应用迁移到用户目录通常可以解决此问题。
392392
393393
## 示例仓库
394-
395394
| 仓库 | 地址 |
396395
| --- | --- |
397396
| Samples(Server + Hub) | [GeneralUpdate-Samples](https://github.com/GeneralLibrary/GeneralUpdate-Samples) |

0 commit comments

Comments
 (0)