New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix lineending #11714

Merged
merged 2 commits into from Dec 12, 2018

Conversation

Projects
None yet
4 participants
@MathiasReker
Copy link
Contributor

MathiasReker commented Dec 11, 2018

Questions Answers
Branch? develop
Description? /
Type? bug fix
Category? CO
BC breaks? Does it break backward compatibility? no
Deprecations? Does it deprecate an existing feature? no
Fixed ticket? /
How to test? /

This change is Reviewable

@PierreRambaud

This comment has been minimized.

Copy link
Contributor

PierreRambaud commented Dec 11, 2018

@PrestaShop/prestashop-core-developers No need QA. It move CRLF to LF.

@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 11, 2018

@MathiasReker I think some conflicts came from the previously merge PRs

@MathiasReker

This comment has been minimized.

Copy link
Contributor

MathiasReker commented Dec 11, 2018

@jolelievre fixed =)

@jolelievre jolelievre merged commit b970306 into PrestaShop:develop Dec 12, 2018

2 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@jolelievre

This comment has been minimized.

Copy link
Contributor

jolelievre commented Dec 12, 2018

thanks @MathiasReker

@PierreRambaud PierreRambaud added this to the 1.7.6.0 milestone Dec 19, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment