submit assignment by Yifei Sun #36
Open
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
mjumbewu
reviewed
Dec 16, 2022
site/js/template-tools.js
Outdated
Comment on lines
1
to
8
| /* | ||
| * @Author: miaomiao612 [email protected] | ||
| * @Date: 2022-12-15 04:26:59 | ||
| * @LastEditors: miaomiao612 [email protected] | ||
| * @LastEditTime: 2022-12-15 04:28:45 | ||
| * @FilePath: \school-explorer\site\js\template-tools.js | ||
| * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | ||
| */ |
There was a problem hiding this comment.
@miaomiao612 It looks like you have conflicts that are preventing the tests from running. I think if you remove this block of comments here it should resolve the conflicts.
Suggested change
| /* | |
| * @Author: miaomiao612 dddoctorr612@gmail.com | |
| * @Date: 2022-12-15 04:26:59 | |
| * @LastEditors: miaomiao612 dddoctorr612@gmail.com | |
| * @LastEditTime: 2022-12-15 04:28:45 | |
| * @FilePath: \school-explorer\site\js\template-tools.js | |
| * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE | |
| */ |
You might also just be able to sync your fork; you might want to try that first.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.