Skip to content
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

Added dracula theme style #1636

Merged
merged 4 commits into from Dec 24, 2020
Merged

Added dracula theme style #1636

merged 4 commits into from Dec 24, 2020

Conversation

@danvilar
Copy link
Contributor

@danvilar danvilar commented Dec 14, 2020

Related to issue #1631

@danvilar
Copy link
Contributor Author

@danvilar danvilar commented Dec 14, 2020

Corrected a column that was missing

@danvilar
Copy link
Contributor Author

@danvilar danvilar commented Dec 14, 2020

I need some help with the failed check

@Leistungsabfall
Copy link
Contributor

@Leistungsabfall Leistungsabfall commented Dec 14, 2020

Try force pushing your last commit

@danvilar
Copy link
Contributor Author

@danvilar danvilar commented Dec 14, 2020

Try force pushing your last commit

I'm not sure how to do it. I did git push --force on my fork, but it just says "Everything up-to-date". I apologise in advance, I'm not used to doing it.

@Leistungsabfall
Copy link
Contributor

@Leistungsabfall Leistungsabfall commented Dec 14, 2020

Run git commit --amend and then close nano (or whatever your default text editor is) without saving. Then execute git push --force.

@danvilar
Copy link
Contributor Author

@danvilar danvilar commented Dec 14, 2020

Thank you @Leistungsabfall! I never used amends before. Nice to know for the future!

@Leistungsabfall
Copy link
Contributor

@Leistungsabfall Leistungsabfall commented Dec 14, 2020

You're welcome 🎅

@Anteru Anteru added this to the 2.7.4 milestone Dec 24, 2020
@Anteru Anteru merged commit bd378d0 into pygments:master Dec 24, 2020
13 checks passed
@Anteru
Copy link
Collaborator

@Anteru Anteru commented Dec 24, 2020

Merged for the next release, thanks!

@Anteru Anteru self-assigned this Dec 24, 2020
@AkibAzmain
Copy link

@AkibAzmain AkibAzmain commented Dec 25, 2020

@Anteru Can you please review my pull request #1642?

@Anteru
Copy link
Collaborator

@Anteru Anteru commented Jan 12, 2021

I just noticed while preparing the 2.7.4 release that the license terms don't match. I've reverted the change; can you please check again and commit it with the correct license? I presume this was all written by you and is original code, so it shouldn't be a problem. According to our Contributing guidelines, you must accept putting the code under 2-clause BSD.

Anteru added a commit that referenced this issue Jan 12, 2021
This reverts commit bd378d0.

The license terms in dracula.py don't match. We'll add it back once the
author places it under the correct license.
@tomy0000000
Copy link

@tomy0000000 tomy0000000 commented May 8, 2021

@danvilar Just in case you missed this, been waiting for this, please take a look. Thanks.

@danvilar
Copy link
Contributor Author

@danvilar danvilar commented May 8, 2021

I will make a new pull request as soon as possible.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants