summaryrefslogtreecommitdiff
path: root/doc/_themes/sphinx_bootstrap_theme/bootstrap/static/js/jquery-fix.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2014-09-05 15:28:22 +0200
committerChristophe Simonis <chs@odoo.com>2014-09-05 15:28:22 +0200
commit31bf30d2d0eb78baaa36360b99fe58bf7cd4c9e7 (patch)
treed7be61ecd6bb4c8b5552e39b03e2a64eebbbf323 /doc/_themes/sphinx_bootstrap_theme/bootstrap/static/js/jquery-fix.js
parentafba9e8817c458640ae446ac7aaaab79be4fe1e9 (diff)
parented1c173971968eaa96693cb4e1547efa6e6c34e0 (diff)
[MERGE] forward port of branch 8.0 up to ed1c173
Diffstat (limited to 'doc/_themes/sphinx_bootstrap_theme/bootstrap/static/js/jquery-fix.js')
-rw-r--r--doc/_themes/sphinx_bootstrap_theme/bootstrap/static/js/jquery-fix.js2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/_themes/sphinx_bootstrap_theme/bootstrap/static/js/jquery-fix.js b/doc/_themes/sphinx_bootstrap_theme/bootstrap/static/js/jquery-fix.js
deleted file mode 100644
index a30ca53dc1f..00000000000
--- a/doc/_themes/sphinx_bootstrap_theme/bootstrap/static/js/jquery-fix.js
+++ /dev/null
@@ -1,2 +0,0 @@
-// No Conflict in later (our) version of jQuery
-window.$jqTheme = jQuery.noConflict(true); \ No newline at end of file