another forgotten marker

kaifox · kaifox · commit 293a24aaa375 · 2017-07-04T23:03:33.000+02:00
diff --git a/src/java/org/tensorics/core/tensor/lang/OngoingDeferredTensorOperation.java b/src/java/org/tensorics/core/tensor/lang/OngoingDeferredTensorOperation.java
@@ -48,7 +48,7 @@ public class OngoingDeferredTensorOperation<V> implements OngoingOperation<Expre
 	private final OptionRegistry<ManipulationOption> optionRegistry;
 
 	/**
-	 * Creates a new instance of the this ongoing operation. <<<<<<< HEAD
+	 * Creates a new instance of the this ongoing operation.
 	 *
 	 * @param field
 	 *            the field to use

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public class OngoingDeferredTensorOperation<V> implements OngoingOperation<Expre`
`48`	`48`	`private final OptionRegistry<ManipulationOption> optionRegistry;`
`49`	`49`
`50`	`50`	`/**`
`51`		`- * Creates a new instance of the this ongoing operation. <<<<<<< HEAD`
	`51`	`+ * Creates a new instance of the this ongoing operation.`
`52`	`52`	`*`
`53`	`53`	`* @param field`
`54`	`54`	`* the field to use`