rebase to current

2017-12-17 23:35:34 -05:00 · 2017-12-17 23:35:34 -05:00 · 1d3229a729
parent a9e60d3450 2b47631f4d
commit 1d3229a729
1 changed files with 4 additions and 0 deletions
--- a/src/core/config/modules/Default.js
+++ b/src/core/config/modules/Default.js
@ -156,11 +156,15 @@ 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


    /*