Skip to content

sl5924 #20

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
Open
JeremyHide wants to merge 4 commits into
base: master
Choose a base branch
from
Open

sl5924 #20

JeremyHide wants to merge 4 commits into from

Conversation

@JeremyHide
Copy link
Contributor

@JeremyHide JeremyHide commented Oct 28, 2016

No description provided.

@ds-ga-1007
Copy link
Owner

ds-ga-1007 commented Oct 30, 2016

I am just letting you know that your repo has conflicts.
Conflicting files: adventure/advent

@JeremyHide
Copy link
Contributor Author

JeremyHide commented Oct 30, 2016

I have deleted the adventure folder, with just answers.txt left, does it work?

@ds-ga-1007
Copy link
Owner

ds-ga-1007 commented Oct 30, 2016

Conflicting files
adventure/README.txt
adventure/adventure.py
adventure/data.py
adventure/play.py
adventure/tests/test_commands.py
adventure/tests/test_data.py
adventure/tests/test_walks.py
adventure/tests/vignettes.txt
adventure/tests/walkthrough1.txt
adventure/tests/walkthrough2.txt

@ds-ga-1007
Copy link
Owner

ds-ga-1007 commented Nov 1, 2016

Please resolve your conflicts. Please let me know if you have re-submitted.

@JeremyHide
Copy link
Contributor Author

JeremyHide commented Nov 1, 2016

Sorry, I have resubmitted.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@JeremyHide @ds-ga-1007