Skip to content
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

Normalize line endings #441

Merged
merged 1 commit into from
Nov 20, 2018
Merged

Conversation

slang25
Copy link
Member

@slang25 slang25 commented Nov 20, 2018

With credit to @martincostello for the gitattribute specifics. If we merge this and I do the same for #426, it should be much easier to review.

@slang25 slang25 requested a review from a team as a code owner November 20, 2018 19:32
adammorr
adammorr previously approved these changes Nov 20, 2018
Copy link
Contributor

@adammorr adammorr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving as guessing the only actual change is the one made to .gitattributes?

@slang25
Copy link
Member Author

slang25 commented Nov 20, 2018

Yep https://github.com/justeat/JustSaying/pull/441/files?w=1

Pro-tip: don't open the regular diff on your phone

@slang25
Copy link
Member Author

slang25 commented Nov 20, 2018

@adammorr could you please re-approve please, I forced pushed to retrigger appveyor, which didn't respond to the first commit for some reason.

@adammorr
Copy link
Contributor

@slang25 it is done

@slang25 slang25 merged commit 4d85fbf into justeattakeaway:master Nov 20, 2018
@slang25 slang25 added this to the v7.0.0 milestone Nov 20, 2018
@martincostello
Copy link
Member

My eyes! 🙈

@AnthonySteele
Copy link
Contributor

@martincostello Diff settings|Hide whitespace changes

@martincostello
Copy link
Member

Still have to see it before you change the option 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants