1
0
mirror of https://github.com/DanilaFe/abacus synced 2024-12-24 00:10:09 -08:00

Remove leftover merge conflict marker.

This commit is contained in:
Danila Fedorin 2017-08-04 14:48:08 -07:00
parent d1a084363e
commit 208b40c96d

View File

@ -366,8 +366,6 @@ public class StandardPlugin extends Plugin {
} }
}; };
/** /**
* <<<<<<< HEAD
* =======
* The caret / pow operator, ^ * The caret / pow operator, ^
*/ */
public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() { public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {