Removed extra lines and fixed conflicts

abdheshkumar · abdheshkumar · commit ee51640acdd7 · 2018-03-04T21:00:01.000Z
diff --git a/src/main/scala/com/lightbend/kafka/scala/streams/KTableS.scala b/src/main/scala/com/lightbend/kafka/scala/streams/KTableS.scala
@@ -21,7 +21,7 @@ class KTableS[K, V](val inner: KTable[K, V]) {
 
   def filter(predicate: (K, V) => Boolean,
     materialized: Materialized[K, V, KeyValueStore[Bytes, Array[Byte]]]): KTableS[K, V] = {
-    inner.filter(predicate(_, _), materialized)
+    inner.filter(predicate, materialized)
   }
 
   def filterNot(predicate: (K, V) => Boolean): KTableS[K, V] = {

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class KTableS[K, V](val inner: KTable[K, V]) {`
`21`	`21`
`22`	`22`	`def filter(predicate: (K, V) => Boolean,`
`23`	`23`	`materialized: Materialized[K, V, KeyValueStore[Bytes, Array[Byte]]]): KTableS[K, V] = {`
`24`		`- inner.filter(predicate(_, _), materialized)`
	`24`	`+ inner.filter(predicate, materialized)`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`def filterNot(predicate: (K, V) => Boolean): KTableS[K, V] = {`