Vertfromage / ManFight

Two classes Man and ManFight that together make a fun little text game
MIT License
7 stars 29 forks source link

Update of Main class #7

Closed barbaraips closed 4 years ago

barbaraips commented 4 years ago
Vertfromage commented 4 years ago

Hey barbaraips,

I'm merging pull requests in order of when they arrive. Unfortunately SinSentido sent his pull request first and added a character creation class, so 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 the conflicts in a day or two when I get a chance.

barbaraips commented 4 years ago

Hi, sorry for taking so long to reply. I guess you already resolved the conflicts, so thank you. I'm hoping to contribute more in the future, I really liked your game.

Vertfromage commented 4 years ago

Thanks, you're welcome to contribute some more.