Merge

2017-04-27 22:42:07 +00:00 · 2017-04-27 22:42:07 +00:00 · a5fe77bef8
commit a5fe77bef8
parent e3096aa5c6 a7569450aa
1 changed files with 4 additions and 0 deletions
--- a/src/api/helpers/BeanLoader.php
+++ b/src/api/helpers/BeanLoader.php
@ -177,7 +177,11 @@ class BeanLoader {
            foreach ($data->assignees as $assignee) {
                $user = R::load('user', $assignee->id);

+<<<<<<< HEAD
                if ((int)$user->id) {
+=======
+                if ((int) $user->id) {
+>>>>>>> a7569450aa54ac34b66b15dac66d0ea95dac7cb4
                    $task->sharedUserList[] = $user;
                }
            }