I really need to learn git

2017-12-17 23:45:15 -05:00 · 2017-12-17 23:45:15 -05:00 · 81082ea001
parent 1d3229a729
commit 81082ea001
1 changed files with 0 additions and 7 deletions
--- 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


    /*