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 Java source file line breaks to LF #4178

Merged
merged 2 commits into from Sep 18, 2015
Merged

Conversation

mtbc
Copy link
Member

@mtbc mtbc commented Sep 17, 2015

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

--rebased-to #4185

@ximenesuk
Copy link
Contributor

Without examining every line, the "changes" look good. Given that the integration tests didn't fail badly I'd say this is good to merge.

@sbesson
Copy link
Member

sbesson commented Sep 18, 2015

Same question as #4179, would this PR actually be a rebase candidate to keep things in sync?

@mtbc
Copy link
Member Author

mtbc commented Sep 18, 2015

Same for #4148 and #4183? I could open a similar 5.1 PR if now's a time it's unlikely to conflict.

@mtbc
Copy link
Member Author

mtbc commented Sep 18, 2015

See #4185.

sbesson added a commit that referenced this pull request Sep 18, 2015
switch Java source file line breaks to LF
@sbesson sbesson merged commit eeb41b4 into ome:develop Sep 18, 2015
@mtbc mtbc deleted the unix-EOLs-Java branch September 18, 2015 09:40
@sbesson sbesson modified the milestone: 5.1.4 Sep 21, 2015
@sbesson sbesson added this to the 5.2.0 milestone Oct 2, 2015
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.

None yet

3 participants