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

switch source file line breaks to LF #4148

Merged
merged 6 commits into from Sep 9, 2015
Merged

switch source file line breaks to LF #4148

merged 6 commits into from Sep 9, 2015

Conversation

mtbc
Copy link
Member

@mtbc mtbc commented Sep 8, 2015

We generally use Unix-style line endings but some files differ. This PR fixes (now, some of) those outliers. No change at all should be observed with OMERO's behavior. See https://github.com/openmicroscopy/openmicroscopy/pull/4148/files?w=1.

--rebased-to #4185

@joshmoore
Copy link
Member

"Showing 0 changed files with 0 additions and 0 deletions." when viewing with ?w=1

@sbesson
Copy link
Member

sbesson commented Sep 8, 2015

As a heads-up, assuming this is going to conflict with the rebase of #4145, can we postpone this cleanup once the MATLAB changes are in?

@mtbc
Copy link
Member Author

mtbc commented Sep 8, 2015

Rather than check for specific conflicts, have force-pushed away commits that touch any MATLAB file, or any server/blitz Java source file (for @jburel's Javadoc work on ome.services.*); we can get this in then finish anything else up in separate PRs once those others are in.

@sbesson
Copy link
Member

sbesson commented Sep 8, 2015

👍 works for me

sbesson added a commit that referenced this pull request Sep 9, 2015
switch source file line breaks to LF
@sbesson sbesson merged commit 5c2070a into ome:develop Sep 9, 2015
@mtbc mtbc deleted the unix-EOLs branch September 9, 2015 09:13
@sbesson sbesson added this to the 5.2.0 milestone Oct 2, 2015
rgozim pushed a commit to rgozim/openmicroscopy that referenced this pull request Oct 8, 2018
switch source file line breaks to LF
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.

None yet

3 participants