Conflicts

2017-07-12 16:38:29 -04:00
parent 53989da252 8d74232727
commit d6f3047b6f
3 changed files with 2 additions and 22 deletions
--- a/workflow/engine/classes/class.derivation.php
+++ b/workflow/engine/classes/class.derivation.php
@@ -2285,4 +2285,5 @@ class Derivation
        }
        return $iNewDelIndex;
    }
+
 }