From 81082ea001e4db9948c2e4089c695a389b72d416 Mon Sep 17 00:00:00 2001
From: bwhitn <brian.m.whitney@outlook.com>
Date: Sun, 17 Dec 2017 23:45:15 -0500
Subject: [PATCH] I really need to learn git

---
 src/core/config/modules/Default.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/core/config/modules/Default.js b/src/core/config/modules/Default.js
index 83545221..6f672ce2 100644
--- a/src/core/config/modules/Default.js
+++ b/src/core/config/modules/Default.js
@@ -156,15 +156,8 @@ OpModules.Default = {
     "Conditional Jump":     FlowControl.runCondJump,
     "Return":               FlowControl.runReturn,
     "Comment":              FlowControl.runComment,
-<<<<<<< HEAD
-<<<<<<< HEAD
     "PHP Deserialize":      PHP.runDeserialize,
-=======
     "Arithmetic":           Arithmetic.runOp,
->>>>>>> Added additional arithmetic source
-=======
-    "Arithmetic":           Arithmetic.runOp,
->>>>>>> 2b47631f4d9c1174ca841005f4cc04c12df7225c
 
 
     /*