Skip to content

Commit

Permalink
put the copyright back in
Browse files Browse the repository at this point in the history
  • Loading branch information
abersnaze committed Jun 5, 2015
1 parent 79a35a5 commit ad5ad00
Showing 1 changed file with 23 additions and 4 deletions.
27 changes: 23 additions & 4 deletions src/main/java/rx/observable/ListenableFutureObservable.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,33 @@
/**
* Copyright 2014 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package rx.observable;

import java.util.concurrent.Executor;
import com.google.common.util.concurrent.AbstractFuture;
import com.google.common.util.concurrent.ListenableFuture;

import rx.*;
import rx.Observable;
import rx.Observable.OnSubscribe;
import rx.Scheduler.Worker;
import rx.functions.Action0;
import rx.internal.operators.SingleDelayedProducer;
import rx.Observer;
import rx.Scheduler;
import rx.Scheduler.Worker;
import rx.Subscriber;

import com.google.common.util.concurrent.*;
import java.util.concurrent.Executor;

public class ListenableFutureObservable {

Expand Down

0 comments on commit ad5ad00

Please sign in to comment.