This repository has been archived by the owner on Oct 3, 2023. It is now read-only.
Merge Dev #71
Closed
Merge Dev #71
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deploying with
|
| Latest commit: |
8300f54
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://b132e8ff.xmoj-script-web.pages.dev |
| Branch Preview URL: | https://dev.xmoj-script-web.pages.dev |
|
欸，别着急Merge，等等！ |
我只是解决一下merge conflict @langningchen |
|
哦，好吧，这个Conflict是我造的 |
langningchen
approved these changes
Aug 24, 2023
|
嗯？Conflict没了？ |
我fix了啊 |
This is for debugging, I think
|
@langningchen Should I merge this? |
|
@boomzero 等等！ |
langningchen
suggested changes
Aug 25, 2023
|
这有几个更改不太好，我会退一下 |
added 5 commits
August 25, 2023 08:46
added 3 commits
August 25, 2023 09:49
|
? |
|
@boomzero 你Milestone都还没有实现怎么Merge到master？ |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
有merge conflict...
This fixes #70