search

K-Mistele / seeker-of-the-sword

ascii-character adventure code written into console via python
Other
5 stars 0 forks source link

Develop/mac osx port #27

Closed amistele closed 6 years ago

amistele commented 6 years ago

Need to resolve merge conflicts, which I actually don't know how to do at this point....

amistele commented 6 years ago

Ok, so I think I managed to remove merge conflicts. Please review.