search

JoCaNo-Productions / flat-land

1 stars 0 forks source link

Revamp base classes #3

Closed nmay231 closed 5 years ago

nmay231 commented 5 years ago

Main additions/changes

nmay231 commented 5 years ago

Also added 'champs/' folder. Each file in that folder will contain the code for each Champ.

nmay231 commented 5 years ago

I can resolve the conflicts if you have no issues with the merge.

calebmrose00 commented 5 years ago

go ahead.

http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail Virus-free. www.avg.com http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=webmail <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

On Tue, Jul 24, 2018 at 9:57 PM, Noah notifications@github.com wrote:

I can resolve the conflicts if you have no issues with the merge.

— You are receiving this because your review was requested. Reply to this email directly, view it on GitHub https://github.com/JoCaNo-Productions/flat-land/pull/3#issuecomment-407625668, or mute the thread https://github.com/notifications/unsubscribe-auth/AnXdQeopCPFyHv51rnoIaBtZZMC0WxnWks5uJ-yTgaJpZM4VfYie .

nmay231 commented 5 years ago

Merged locally.