This repository has been archived by the owner on Feb 23, 2024. It is now read-only.
Resolve merge conflict #22
Merged
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
simonostendorf
approved these changes
Sep 30, 2022
simonostendorf
added a commit
that referenced
this pull request
Sep 30, 2022
* add index (#4) * remove theme override * add index page * add redirect to index (#5) * remove theme override * add index page * add redirect to ci * fix typos and errors (#6) * remove theme override * add index page * add redirect to ci * fix typos and errors * Create dependabot.yml (#13) * Add basic release.yml (#10) * Add requirements.txt and improve ci (#11) * Improve workflows (#20) * Add requirements.txt and improve ci * Improve workflows * Resolve merge conflict (#22) * remove theme override * add index page * add redirect to ci * fix typos and errors Co-authored-by: simonostendorf <github@simon-ostendorf.de> Co-authored-by: Simon Ostendorf <github@simon-ostendorf.de>
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.
No description provided.