Fix conflicts after merge with develop, more conflictst

2019-07-04 14:56:52 -04:00
parent 416093f698 9f2a543c2d
commit ee92390937
2 changed files with 2 additions and 3 deletions
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -2149,7 +2149,6 @@ class WorkspaceTools
                $workspace->upgradeSchema($systemSchema);
                CLI::logging("* End adding/replenishing all indexes...(Completed on " . (microtime(true) - $start) . " seconds)\n");

-                /*----------------------------------********---------------------------------*/
                CLI::logging("* Start migrating to new list tables...\n");
                $start = microtime(true);
                $workspace->migrateList(true, $lang);