Joe91 / fun-bots

A highly customizable and configurable bot mod for your Venice Unleashed Battlefield 3 server.
https://discord.gg/zNk3qCzk6x
249 stars 46 forks source link

Cleaned up merge conflict mess #177

Closed Firjens closed 3 years ago

Firjens commented 3 years ago

Each time there's a merge conflict, random files come back, get removed or changed, why Git? Why?