conflicts

2019-05-02 14:48:50 -04:00
parent 532f872966
commit 5955ff6737
3 changed files with 43 additions and 10 deletions
--- a/workflow/engine/src/ProcessMaker/Model/ProcessCategory.php
+++ b/workflow/engine/src/ProcessMaker/Model/ProcessCategory.php
@@ -14,4 +14,6 @@ class ProcessCategory extends Model
 {
    // Set our table name
    protected $table = 'PROCESS_CATEGORY';
+
+    public $timestamps = false;
 }