From 33149e1afa2717ba4b1b98ed138d84b27f5e9a0d Mon Sep 17 00:00:00 2001
From: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date: Tue, 31 Jul 2018 09:47:17 +0200
Subject: [PATCH] fix conflict from previous PR

---
 website/client/components/tasks/taskModal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/website/client/components/tasks/taskModal.vue b/website/client/components/tasks/taskModal.vue
index ce6aeece9a..c824c06c28 100644
--- a/website/client/components/tasks/taskModal.vue
+++ b/website/client/components/tasks/taskModal.vue
@@ -997,13 +997,13 @@ export default {
     focusInput () {
       this.$refs.inputToFocus.focus();
     },
-<<<<<<< HEAD
     handleEsc (e) {
       if (e.keyCode === 27 && this.showTagsSelect) {
-=======
+        this.closeTagsPopup();
+      }
+    },
     handleClick (e) {
       if (this.$refs.popup && !this.$refs.popup.$el.contains(e.target)) {
->>>>>>> thefifthisa-clickout
         this.closeTagsPopup();
       }
     },