Fixing some merge conflict bugs

landenf / Settlers-of-Catan

Multiplayer Online version of Settlers of Catan

https://catan-4dea2.web.app

2 stars 0 forks source link

Closed SirFatredVIII closed 2 months ago

SirFatredVIII commented 2 months ago

I messed up the merge conflict resolution from yesterday, so this branch fixes those issues.