Fix wrongly detected conflict markers - Githubissues

cpmech / gosl

Linear algebra, eigenvalues, FFT, Bessel, elliptic, orthogonal polys, geometry, NURBS, numerical quadrature, 3D transfinite interpolation, random numbers, Mersenne twister, probability distributions, optimisation, differential equations.

BSD 3-Clause "New" or "Revised" License

1.83k stars 145 forks source link

Fix wrongly detected conflict markers #17

Closed CalOmnie closed 7 years ago

CalOmnie commented 7 years ago

When adding gosl as a vendored dependency in a gerrit-supervised repo, one would get this error:

! [remote rejected] HEAD -> refs/for/master (XXXXX contains conflict markers)

This simple change fixes that.

cpmech commented 7 years ago

Thank you!