Skip to content

Conversation

@mtbc
Copy link
Member

@mtbc mtbc commented Jan 24, 2013

Rebase of #230 from dev_4_4 to develop.

@sbesson
Copy link
Member

sbesson commented Jan 28, 2013

Looks good. Ready to merge.

@jburel
Copy link
Member

jburel commented Jan 28, 2013

@mtbc: due to a conflict, the PR cannot be merged. Could you fix it?

@mtbc
Copy link
Member Author

mtbc commented Jan 29, 2013

Okay, done (I think). It worked automatically locally, I wonder if local git has more merge strategies available to it by default than github's or something, and if that's a bug or a feature.

jburel added a commit that referenced this pull request Jan 29, 2013
Remove extra spaces on build system links.
@jburel jburel merged commit fba3536 into ome:develop Jan 29, 2013
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