From b3a752ef34cb1cd324f7e2b55bebef81fb2281c3 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Sun, 16 Sep 2018 00:44:41 +0300
Subject: Merge rules.

---
 models/cards.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'models/cards.js')

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: {
-- 
cgit v1.2.3-1-g7c22