Fixed a few TODOs - Githubissues

federicomarini / quantiseqr

https://federicomarini.github.io/quantiseqr/

GNU General Public License v3.0

0 stars 2 forks source link

Fixed a few TODOs #16

Closed FFinotello closed 3 years ago

federicomarini commented 3 years ago

Any idea what the "conflicts" should be? To me they look pretty similar - is it some weird misinterpretation of whitespaces and git is complaining?

federicomarini commented 3 years ago

Seems it is not just about the final line ending - the web editor seems still to be annoyed. Thanks for the tip, still @grst

grst commented 3 years ago

running dos2unix did the trick. For future PRs the .gitattributes should indeed solve that (at least when using a local git client, not sure about the web editor)

federicomarini commented 3 years ago

Got it, thanks a lot! I'm normally bouncing among unix machines, so I never encountered that issue. F