Update tea.json - Githubissues

snoonetIRC / CloudBot

CloudBot - The simple, fast, expandable, open-source Python IRC Bot!

GNU General Public License v3.0

68 stars 52 forks source link

Update tea.json #577

Closed jaco1982 closed 5 years ago

jaco1982 commented 5 years ago

Updated teas with new actions, temperatures, sizes and teas

jaco1982 commented 5 years ago

OK, there was a conflict, which stopped the commit from going through. I suspect I might have resolved the conflict in the wrong direction. I'm going to close this PR, get this file formatted properly and will submit a new PR then.