This repository has been archived by the owner on Oct 14, 2024. It is now read-only.

Sync template (manual resolution required) #7

Closed

ghost wants to merge 2 commits into development from sync-template/development

ghost commented Oct 13, 2024

This pull request merges changes from the template repository.
There may be conflicts that require manual resolution.
Conflicts:

$ git merge template/main --allow-unrelated-histories --no-commit 
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.

ariesgun and others added 2 commits

October 13, 2024 16:35


          Updated

06eaa23


          chore: sync template (with potential conflicts)

957a80f

ariesgun closed this

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet