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

Eol #326

Merged
merged 2 commits into from Jun 6, 2018
Merged

Eol #326

merged 2 commits into from Jun 6, 2018

Conversation

@Thrameos
Copy link
Contributor

@Thrameos Thrameos commented Jun 6, 2018

This is a pull request to normalize all files to eol in the repo after the thunk pull request is merge. It may or may not affect the blame depending on if -w is applied. It is not clear to me if the annotations shown on github are with or without -w.

@marscher
Copy link
Member

@marscher marscher commented Jun 6, 2018

Thanks. Why did you include the setup related stuff in this PR?

@marscher
Copy link
Member

@marscher marscher commented Jun 6, 2018

I guess to make CI pass 👍

@marscher marscher merged commit 490eb65 into jpype-project:master Jun 6, 2018
1 check passed
@Thrameos
Copy link
Contributor Author

@Thrameos Thrameos commented Jun 6, 2018

Sorry that was my fault. I thought you would put the thunk in first and then I would rebase the EOL, but you pulled the EOL first. I should have been more clear.

@Thrameos Thrameos deleted the eol branch Jun 6, 2018
@marscher
Copy link
Member

@marscher marscher commented Jun 6, 2018

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

Successfully merging this pull request may close these issues.

None yet

2 participants