Closed FRYoussef closed 5 years ago
What happened with the wikichron/dash/main.py
file?
It looks like if the whole file changed :confused:
The rest looks good to me.
That's because when i tried to merge it marked the whole file as a conflict
The problem was that you changed the unix line breaks to Windows line breaks in the wikichron/dash/main.py
file. I have switched them back to unix ones and now the diff it's alright.
Remind to always have set LF for line breaks for all the files in this project.
Changes: