Merge pull request #1814 from pavel-mironchik/bootstrap-jquery
Do not include jQuery twice.
This commit is contained in:
commit
8ad02c8c67
|
|
@ -8,7 +8,9 @@ window._ = require('lodash');
|
|||
*/
|
||||
|
||||
try {
|
||||
window.$ = window.jQuery = require('jquery');
|
||||
if (!window.$) {
|
||||
window.$ = window.jQuery = require('jquery');
|
||||
}
|
||||
|
||||
//require('bootstrap-sass');
|
||||
} catch (e) {}
|
||||
|
|
|
|||
Loading…
Reference in New Issue