DanilaFe/Abacus
1
0
Fork 0
mirror of https://github.com/DanilaFe/abacus synced 2024-12-23 16:00:09 -08:00
Code Issues Releases Wiki Activity

Remove leftover merge conflict marker.

Browse Source
This commit is contained in:
Danila Fedorin 2017-08-04 14:48:08 -07:00
parent d1a084363e
commit 208b40c96d
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
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() {