Skip to content

Fix by wc#3

Open
lyzbcy wants to merge 4 commits into
mainfrom
fix-by-wc
Open

Fix by wc#3
lyzbcy wants to merge 4 commits into
mainfrom
fix-by-wc

Conversation

@lyzbcy

@lyzbcy lyzbcy commented May 13, 2026

Copy link
Copy Markdown
Owner

No description provided.

@lyzbcy

lyzbcy commented May 13, 2026

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts in this pull request

Copilot AI commented May 13, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts in this pull request

Resolved in 9605626. I merged main into this branch, resolved the 1.DemoNight.unity add/add conflict using the main scene version, and kept this branch’s other added files intact. The PR should now be conflict-free.

Copilot stopped work on behalf of lyzbcy due to an error May 13, 2026 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants