Resolving Branch/File Conflicts

kaiwilens / Python_text-based_game

2 stars 0 forks source link

Resolving Branch/File Conflicts #44

Closed kaiwilens closed 3 years ago

kaiwilens commented 3 years ago

Apparently, while I was figuring out how to push and commit the changes I made to the Character_Helper_Functions.py to Github, I didn't think about letting my team know that I'm going to make these changes and should have made a pull request. I take full responsibility and wouldn't mind a little help resolving this conflict. Thanks!

kaiwilens commented 3 years ago

I see that someone reviewed Luke's pull request #38. Sorry that I couldn't get to this pull request in time.