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

Still conflict? #32

Merged
merged 32 commits into from
Dec 11, 2018
Merged

Still conflict? #32

merged 32 commits into from
Dec 11, 2018

Conversation

tin2tin
Copy link
Contributor

@tin2tin tin2tin commented Dec 7, 2018

Looks like it is because all classes has been renamed to 2.80 standards. Maybe you can take the contents of sequencer.py from my github and paste into yours as a new commit, and then the classes will have the same names and that might solve the conflicts?

@samytichadou samytichadou merged commit 282cec9 into samytichadou:master Dec 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants