Merge rules.

6 files changed, 2 insertions, 13 deletions

diff --git a/client/components/lists/listBody.js b/client/components/lists/listBody.js
index ce8396b9..d99d9dc8 100644
--- a/client/components/lists/listBody.js
+++ b/client/components/lists/listBody.js
@@ -98,8 +98,6 @@ BlazeComponent.extendComponent({
       evt.preventDefault();
       Utils.goBoardId(Session.get('currentBoard'));
     }
-    console.log(evt)
-
   },
 
   cardIsSelected() {
diff --git a/client/components/rules/rulesActions.js b/client/components/rules/rulesActions.js
index d492cbd5..24143f8c 100644
--- a/client/components/rules/rulesActions.js
+++ b/client/components/rules/rulesActions.js
@@ -37,7 +37,7 @@ BlazeComponent.extendComponent({
   },
 
   name() {
-    console.log(this.data());
+    // console.log(this.data());
   },
   events() {
     return [{
@@ -55,4 +55,4 @@ BlazeComponent.extendComponent({
       },
     }];
   },
-}).register('rulesActions');
\ No newline at end of file
+}).register('rulesActions');
diff --git a/client/lib/popup.js b/client/lib/popup.js
index cb56858f..0a700f82 100644
--- a/client/lib/popup.js
+++ b/client/lib/popup.js
@@ -83,7 +83,6 @@ window.Popup = new class {
       // our internal dependency, and since we just changed the top element of
       // our internal stack, the popup will be updated with the new data.
       if (!self.isOpen()) {
-        console.log(self.template)
         self.current = Blaze.renderWithData(self.template, () => {
           self._dep.depend();
           return { ...self._getTopStack(), stack: self._stack };
diff --git a/client/lib/utils.js b/client/lib/utils.js
index a15dac39..24ff830a 100644
--- a/client/lib/utils.js
+++ b/client/lib/utils.js
@@ -145,7 +145,6 @@ Utils = {
     });
   },
 
-<<<<<<< HEAD
   setMatomo(data){
     window._paq = window._paq || [];
     window._paq.push(['setDoNotTrack', data.doNotTrack]);
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);
 }