Compilation & Execution Instructions

Vertfromage / ManFight

Two classes Man and ManFight that together make a fun little text game

MIT License

7 stars 29 forks source link

Compilation & Execution Instructions #11

Closed AlexDvorak closed 5 years ago

AlexDvorak commented 5 years ago

Resolves Issue #9 Also removed an import that was causing issues when compiling

Vertfromage commented 5 years ago

I'm trying to merge pull requests in order of when they arrive if they don't have conflicts. Unfortunately since I merged other pull requests there are conflicts with your branch that need to be resolved, so if you'd like you can resolve the conflicts and I'll merge your pull request next, or I'll get around to resolving conflicts in a day or two when I get a chance.