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.

Sign up for GitHub

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

Jump to bottom

commit conflict #34

Closed
pr0ph0z opened this issue Oct 1, 2019 · 2 comments
Closed

commit conflict #34

pr0ph0z opened this issue Oct 1, 2019 · 2 comments
Labels
hacktoberfest for hacktoberfest question Further information is requested

Comments

@pr0ph0z
Copy link
Collaborator

pr0ph0z commented Oct 1, 2019

as you can see, there are some open pull requests. some of them are has conflict on it. we are openly looking for anyone who able to fix it.
please let us know if you want to take this by comment in this issue. thank you ✨✨✨
@pr0ph0z pr0ph0z added hacktoberfest for hacktoberfest question Further information is requested labels Oct 1, 2019
@2pai
Copy link
Member

2pai commented Oct 1, 2019

should we move to using .json file?

2pai referenced this issue Oct 2, 2019
@2pai
Add rebase to on review, increasing reviewer to 2
336a800
@2pai
Copy link
Member

2pai commented Oct 18, 2020

this issue is fixed by #286 By using 1 JSON file/anime in folder datasources

@2pai 2pai closed this as completed Oct 18, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
hacktoberfest for hacktoberfest question Further information is requested
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@pr0ph0z @2pai