Skip to content

Conversation

@pelson
Copy link
Member

@pelson pelson commented Jan 4, 2018

Necessary follow-up for #2892.

cc: @zklaus

@QuLogic QuLogic added this to the v2.1.0 milestone Jan 4, 2018
@pelson
Copy link
Member Author

pelson commented Jan 11, 2018

7 days old. harmless PR (apart from fixing the copyright header years again, but it merges cleanly).

@dkillick / @ajdawson would either of you mind just hitting merge if you have a second?

@DPeterK
Copy link
Member

DPeterK commented Jan 11, 2018

@pelson the copyright year updates were merged in #2932...

@pelson
Copy link
Member Author

pelson commented Jan 11, 2018

Yep.

but it merges cleanly

😉

@pelson
Copy link
Member Author

pelson commented Jan 11, 2018

I guess it now doesn't merge cleanly, as master's tests are failing... I was trying to save some Travis cycles... 😄

@DPeterK
Copy link
Member

DPeterK commented Jan 11, 2018

I guess it now doesn't merge cleanly, as master's tests are failing...

Argh. Let's fix master's test problems and then I'll look away and press the green button 😉

@pelson
Copy link
Member Author

pelson commented Jan 11, 2018

Ping @dkillick. 😉 🙈

@DPeterK
Copy link
Member

DPeterK commented Jan 11, 2018

@pelson I'm looking away!

@DPeterK DPeterK merged commit 2f6ea5e into SciTools:master Jan 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants