Remove leftover merge conflict marker.

2026-01-08 00:15:19 +00:00 · 2017-08-04 14:48:08 -07:00
parent c541eaab97
commit d06f611a2e
1 changed files with 0 additions and 2 deletions
--- a/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
+++ b/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
@@ -366,8 +366,6 @@ public class StandardPlugin extends Plugin {
        }
    };
    /**
-     * <<<<<<< HEAD
-     * =======
     * The caret / pow operator, ^
     */
    public static final Operator OP_CARET = new Operator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2, new Function() {