diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-09-16 00:44:41 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-09-16 00:44:41 +0300 |
| commit | b3a752ef34cb1cd324f7e2b55bebef81fb2281c3 (patch) | |
| tree | 5b7426c55478365c8f6f0e925542ee91a8a859d6 /models | |
| parent | 6ab5f093d531602c46ae1991335831e3dfa5ab1c (diff) | |
| download | wekan-b3a752ef34cb1cd324f7e2b55bebef81fb2281c3.tar.gz wekan-b3a752ef34cb1cd324f7e2b55bebef81fb2281c3.tar.bz2 wekan-b3a752ef34cb1cd324f7e2b55bebef81fb2281c3.zip | |
Merge rules.
Diffstat (limited to 'models')
| -rw-r--r-- | models/cards.js | 6 | ||||
| -rw-r--r-- | models/checklistItems.js | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/models/cards.js b/models/cards.js index 2595e934..0754b2bb 100644 --- a/models/cards.js +++ b/models/cards.js @@ -933,8 +933,6 @@ Cards.mutations({ } }, -<<<<<<< HEAD -======= assignMember(memberId) { return { $addToSet: { @@ -959,7 +957,6 @@ Cards.mutations({ } }, ->>>>>>> 36c04edb9f7cf16fb450b76598c4957968d4674b assignCustomField(customFieldId) { return { $addToSet: { @@ -1020,8 +1017,6 @@ Cards.mutations({ }; }, -<<<<<<< HEAD -======= setReceived(receivedAt) { return { $set: { @@ -1111,7 +1106,6 @@ Cards.mutations({ }; }, ->>>>>>> 36c04edb9f7cf16fb450b76598c4957968d4674b setParentId(parentId) { return { $set: { diff --git a/models/checklistItems.js b/models/checklistItems.js index e24f0cbd..1657022b 100644 --- a/models/checklistItems.js +++ b/models/checklistItems.js @@ -115,7 +115,6 @@ function publishCheckActivity(userId,doc){ checklistItemId: doc._id, checklistItemName:doc.title } - console.log(act); Activities.insert(act); } |