Did you forget to resolve a git conflict?

MarcPartensky / Fourier

Make fun of fourier transform.

MIT License

17 stars 6 forks source link

Did you forget to resolve a git conflict? #1

Closed moble closed 4 years ago

moble commented 4 years ago

https://github.com/MarcPartensky/Fourier/blob/0e8213f9e259b3e747891a9e6bc0cbfb5bcb41a3/fourier_drawing/__init__.py#L1-L5

moble commented 4 years ago

It looks like there are more unresolved conflicts in these files:

.gitignore
README.md
fourier_drawing/__init__.py
fourier_drawing/context.py
fourier_drawing/draw.py
fourier_drawing/plane.py
fourier_drawing/plane.py
fourier_drawing/window.py
setup.py

MarcPartensky commented 4 years ago

Thanks a lot for noticing the conflicts! I pushed a working version without any of these.