From 208b40c96d818aee497aca64b215c16597620b4f Mon Sep 17 00:00:00 2001
From: Danila Fedorin <danila.fedorin@gmail.com>
Date: Fri, 4 Aug 2017 14:48:08 -0700
Subject: [PATCH] Remove leftover merge conflict marker.

---
 src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java b/src/main/java/org/nwapw/abacus/plugin/StandardPlugin.java
index dcbbf99..4cd75ce 100755
--- 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() {