TheDiscordian / onebot

One bot to rule them all...
BSD 3-Clause "New" or "Revised" License
14 stars 1 forks source link

adding plugin tarkovbud.go #3

Closed RuniteOre closed 4 years ago

TheDiscordian commented 4 years ago

It's complaining about conflicts try something like:

git checkout mark
git fetch
git rebase master
git push

I believe that should do it.

TheDiscordian commented 4 years ago

Oh it's on our repo, I'll try to repair it.

TheDiscordian commented 4 years ago

Updated TarkovBuddy to be less buggy, and I'm accepting it into the plugins as a "v0.0.0" replacement to the Killa bot.