Cleanup from LOL HTML rewrite #937
Merged
Conversation
This file contains hidden or 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
- Add missing index.js - Add missing CSS files - Add Cargo.lock
|
Lockfile issue is from rebasing #930 over master, there was no git-detected conflict, but there is some sort of semantic conflict between the lockfiles that required updating it (would be avoided by using (EDIT: specifically looks like a conflict between #930 and #929, #929 removed existing dependencies that |
|
Ah, that makes sense. CI is still working fine then. |
jyn514
added
S-waiting-on-review
Kixiron
approved these changes
Aug 5, 2020
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.
r? @Kixiron
I don't know how Cargo.lock slipped though, that seems like a regression from #883.