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

Bad merge on requirements.txt #102

Open
ijemafe opened this issue Sep 7, 2017 · 0 comments · May be fixed by #103
Open

Bad merge on requirements.txt #102

ijemafe opened this issue Sep 7, 2017 · 0 comments · May be fixed by #103

Comments

@ijemafe
Copy link

ijemafe commented Sep 7, 2017

It looks like a merge conflict was unresolved for requirements.txt in f4a5b67
YPCrumble added a commit to YPCrumble/Shreddit that referenced this issue Sep 25, 2017
@YPCrumble
Remove merge conflict in requirements.txt
891fbc6 
Fixes x89#102
@YPCrumble YPCrumble linked a pull request Sep 25, 2017 that will close this issue
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

Remove merge conflict in requirements.txt YPCrumble/Shreddit
1 participant
@ijemafe