Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-28 10:54:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge rules.

Browse source
This commit is contained in:
Lauri Ojansivu 2018-09-16 00:44:41 +03:00
parent 6ab5f093d5
commit b3a752ef34
6 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
models/cards.js
View file

@ -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: {

1
models/checklistItems.js
View file

@ -115,7 +115,6 @@ function publishCheckActivity(userId,doc){
checklistItemId: doc._id,
checklistItemName:doc.title
}
console.log(act);
Activities.insert(act);
}