Solving conflicts merginf with last merge in develop branch

2020-11-25 13:18:20 +00:00
parent 8d6c5d1da6 3625d63691
commit 11c6a64ee0
34 changed files with 2288 additions and 680 deletions
--- a/workflow/engine/methods/setup/auditLog.php
+++ b/workflow/engine/methods/setup/auditLog.php
@@ -1,6 +1,6 @@
 <?php

-use ProcessMaker\AuditLog\AuditLog;
+use ProcessMaker\Log\AuditLog;

 global $RBAC;

--- a/workflow/engine/methods/setup/auditLogAjax.php
+++ b/workflow/engine/methods/setup/auditLogAjax.php
@@ -1,6 +1,6 @@
 <?php

-use ProcessMaker\AuditLog\AuditLog;
+use ProcessMaker\Log\AuditLog;

 $auditLog = new AuditLog();
 $auditLog->setUserLogged($_SESSION["USER_LOGGED"]);