-
Notifications
You must be signed in to change notification settings - Fork 33
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update Fix #189
base: trunk
Are you sure you want to change the base?
Update Fix #189
Conversation
Preview changesI've detected changes to the following themes in this PR: Archivist, Blue Note, Poetry, Term, Purr, Atlas. You can preview these changes by following the links below:
I will update this comment with the latest preview links as you push more changes to this PR. |
poetry/templates/404.html
Outdated
@@ -1,3 +1,34 @@ | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is a conflict :D
Going to try to address this this week! :) |
Using the GH CLI I think I have resolved the conflicts here.
I like the design and the text, but why are we making another header? do we think it's going to be one we want to reuse for other templates? Also, it might be time to move the parts that have text into a pattern for internationalization (there's more info on the readme file and you can use blue note as a reference) |
Rebased from PR 145, to resolve issues for the 404 template as suggested my MC as well as resolving accidental push onto the existing #145 branch
this resolves both #144 and #145