search

PythonBulawayo / ChitChat

22 stars 24 forks source link

Fix lint errors #60

Open maunga-et opened 5 months ago

terrameijar commented 5 months ago

@maunga-et thanks, it looks like there is a conflict here. Could you please look into it? Don't close this PR, you can fix the problem and push your commits to this branch. It looks like the conflict is in the migrations and requirements.txt files. Can you undo the changes you made to those two files and push your changes?

Let me know if you need any help.

maunga-et commented 5 months ago

@terrameijar are conflicts in requirements because I added another dependenc. Then that migrations I did not change anything.

terrameijar commented 4 months ago

@maunga-et the conflict is in one of the migration and requirements files:

image

For the sake of getting this merged quickly, I'll have a look and resolve the conflict so you can start working on something else.