Correccion de conflictos

2014-05-29 15:38:10 -04:00
parent db6c8fb6f8
commit 8800f47343
1 changed files with 15 additions and 15 deletions
--- a/workflow/engine/classes/model/Translation.php
+++ b/workflow/engine/classes/model/Translation.php
@@ -124,7 +124,8 @@ class Translation extends BaseTranslation
        while ($rs->next()) {
            $rows[] = $rs->getRow();
        }
-        $result = new StdClass;
+
+        $result = new StdClass();
        $result->data = $rows;
        $result->totalCount = $totalCount;

@@ -635,4 +636,3 @@ class Translation extends BaseTranslation
        }
    }
 }
-