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

Manual Merge of Pull #667 #697

Merged

Conversation

benjchristensen
Copy link
Member

Manual merge of #667

akarnokd and others added 2 commits December 24, 2013 00:48
Conflicts:
	rxjava-core/src/main/java/rx/Observable.java
	rxjava-core/src/main/java/rx/operators/OperationTakeLast.java
benjchristensen added a commit that referenced this pull request Dec 27, 2013
@benjchristensen benjchristensen merged commit d39d9cf into ReactiveX:master Dec 27, 2013
@benjchristensen benjchristensen deleted the skip-take-time-merge branch December 27, 2013 20:22
@cloudbees-pull-request-builder

RxJava-pull-requests #614 SUCCESS
This pull request looks good

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

Successfully merging this pull request may close these issues.

3 participants