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

Fix line endings on windows #373

Merged
merged 1 commit into from
Nov 18, 2015
Merged

Conversation

karyon
Copy link
Contributor

@karyon karyon commented Nov 5, 2015

7eb14b7 removed files/concatfragments.sh and used concatfragments.rb instead. #80 fixed the issue i have for the former .sh file, this PR fixes it for the new .rb file.

actually, this changes the line endings for all .rb files. i don't know whether that's the right way to go...

7eb14b7 removed files/concatfragments.sh and used concatfragments.rb instead. the fix in acf6780 therefore needs to be applied to this .rb file now.
tphoney added a commit that referenced this pull request Nov 18, 2015
@tphoney tphoney merged commit 53d5950 into puppetlabs:master Nov 18, 2015
@karyon karyon deleted the fix_line_endings branch November 18, 2015 21:52
bwwhite pushed a commit to bwwhite/puppetlabs-concat that referenced this pull request Nov 18, 2015
In puppetlabs/pull/373 the .gitattributes file
was updated so that all .rb files should have LF line endings.
quoted_paths_spec.rb had CRLF endings, so upon checkout it would
be marked as changed.
bwwhite added a commit to bwwhite/puppetlabs-concat that referenced this pull request Nov 18, 2015
In puppetlabs/pull/373 the .gitattributes file
was updated so that all .rb files should have LF line endings.
quoted_paths_spec.rb had CRLF endings, but was not converted with
that PR.
@karyon karyon restored the fix_line_endings branch November 19, 2015 07:51
@LukasAud LukasAud added the bugfix label Jun 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants