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 /client/lib | |
| parent | 6ab5f093d531602c46ae1991335831e3dfa5ab1c (diff) | |
| download | wekan-b3a752ef34cb1cd324f7e2b55bebef81fb2281c3.tar.gz wekan-b3a752ef34cb1cd324f7e2b55bebef81fb2281c3.tar.bz2 wekan-b3a752ef34cb1cd324f7e2b55bebef81fb2281c3.zip | |
Merge rules.
Diffstat (limited to 'client/lib')
| -rw-r--r-- | client/lib/popup.js | 1 | ||||
| -rw-r--r-- | client/lib/utils.js | 1 |
2 files changed, 0 insertions, 2 deletions
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]); |