From: Pierre-Denis Vanduynslager <pierre.denis.vanduynslager@gmail.com>
Date: Wed, 4 Jan 2017 17:24:33 +0000 (-0500)
Subject: Merge conflict
X-Git-Tag: v4.0.0-beta~166^2~96^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67958f35e80af425c08fa367e8a6f1eeefb830bc;p=thirdparty%2Fbootstrap.git

Merge conflict
---

diff --git a/js/src/dropdown.js b/js/src/dropdown.js
index 46287fb905..873c106a7b 100644
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@@ -272,14 +272,8 @@ const Dropdown = (($) => {
 
   $(document)
     .on(Event.KEYDOWN_DATA_API, Selector.DATA_TOGGLE,  Dropdown._dataApiKeydownHandler)
-<<<<<<< HEAD
     .on(Event.KEYDOWN_DATA_API, Selector.MENU, Dropdown._dataApiKeydownHandler)
-    .on(Event.CLICK_DATA_API, Dropdown._clearMenus)
-=======
-    .on(Event.KEYDOWN_DATA_API, Selector.ROLE_MENU,    Dropdown._dataApiKeydownHandler)
-    .on(Event.KEYDOWN_DATA_API, Selector.ROLE_LISTBOX, Dropdown._dataApiKeydownHandler)
     .on(`${Event.CLICK_DATA_API} ${Event.FOCUSIN_DATA_API}`, Dropdown._clearMenus)
->>>>>>> twbs/v4-dev
     .on(Event.CLICK_DATA_API, Selector.DATA_TOGGLE, Dropdown.prototype.toggle)
     .on(Event.CLICK_DATA_API, Selector.FORM_CHILD, (e) => {
       e.stopPropagation()