fix broken merge.

scalanlp · Oct 8, 2013 · c19767d · c19767d
1 parent de3e83d
commit c19767d
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/src/main/scala/breeze/linalg/BroadcastedRows.scala b/src/main/scala/breeze/linalg/BroadcastedRows.scala
@@ -60,14 +60,6 @@ object BroadcastedRows {
     }
   }
 
-  implicit def broadcastBinaryOpMulInner[T, ColumnType, RHS, OpResult, Result](implicit op: BinaryOp[ColumnType, RHS, OpMulInner, OpResult], cc: CanCollapseAxis[T, Axis._1.type, ColumnType, OpResult, Result]): BinaryOp[BroadcastedRows[T], RHS, OpMulInner, Result] = {
-    new BinaryOp[BroadcastedRows[T], RHS, OpMulInner, Result] {
-      def apply(a: BroadcastedRows[T], b: RHS): Result = {
-        cc(a.underlying, Axis._1){op(_,b)}
-      }
-    }
-  }
-
   implicit def broadcastBinaryOpDiv[T, ColumnType, RHS, OpResult, Result](implicit op: BinaryOp[ColumnType, RHS, OpDiv, OpResult], cc: CanCollapseAxis[T, Axis._1.type, ColumnType, OpResult, Result]): BinaryOp[BroadcastedRows[T], RHS, OpDiv, Result] = {
     new BinaryOp[BroadcastedRows[T], RHS, OpDiv, Result] {
       def apply(a: BroadcastedRows[T], b: RHS): Result = {