search

gunthercox / chatterbot-corpus

A multilingual dialog corpus
http://chatterbot-corpus.readthedocs.io
BSD 3-Clause "New" or "Revised" License
1.36k stars 1.15k forks source link

Create psicologia.yml #145

Open locutusbn opened 5 years ago

gunthercox commented 5 years ago

These changes look good but get hub as telling me that I can't merge them because there's merge conflicts. These will have to be resolved before I can merge this change in.

vkosuri commented 4 years ago

@locutusbn please resolve conflicts, use web-editor to resolve in effective manner.