Skip to content

Conversation

@dimitar-asenov
Copy link
Contributor

This annotation has been accidentally omitted when resolving a conflict during the merging of:
96feb27 and 98cccec
into:
d6bf9d1

We made PRs for both versions 1.x and 2.x.

We found the missing annotation while processing RxJava's git repository using a tool for structured code merge that we're developing as part of the Envision IDE: www.pm.inf.ethz.ch/research/envision.html

@akarnokd akarnokd added the Test label Aug 16, 2016
@akarnokd akarnokd added this to the 2.0 RC 1 milestone Aug 16, 2016
@akarnokd akarnokd merged commit a57741b into ReactiveX:1.x Aug 16, 2016
@akarnokd akarnokd removed this from the 2.0 RC 1 milestone Aug 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants