Remove stray HEAD line

benjchristensen · benjchristensen · commit f651b7a504f9 · 2013-07-22T09:56:08.000-07:00
diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
@@ -638,7 +638,6 @@ public Subscription call(Observer<T> observer) {
     }
 
     /**
-<<<<<<< HEAD
      * Creates an Observable which produces buffers of collected values. This Observable produces connected
      * non-overlapping buffers. The current buffer is emitted and replaced with a new buffer when the
      * Observable produced by the specified {@link Func0} produces a {@link BufferClosing} object. The

Original file line number	Diff line number	Diff line change
`@@ -638,7 +638,6 @@ public Subscription call(Observer<T> observer) {`
`638`	`638`	`}`
`639`	`639`
`640`	`640`	`/**`
`641`		`-<<<<<<< HEAD`
`642`	`641`	`* Creates an Observable which produces buffers of collected values. This Observable produces connected`
`643`	`642`	`* non-overlapping buffers. The current buffer is emitted and replaced with a new buffer when the`
`644`	`643`	`* Observable produced by the specified {@link Func0} produces a {@link BufferClosing} object. The`