Remove plugins to prevent conflict

Ichi1234567 · Mar 12, 2015 · d33a1bc · d33a1bc
1 parent 5e67aa9
commit d33a1bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/bundles.vim b/bundles.vim
@@ -40,7 +40,6 @@ Bundle 'junegunn/vim-easy-align'
 Bundle 'utl.vim'
 " text object based on indent level (ai, ii)
 Bundle 'austintaylor/vim-indentobject'
-Bundle 'lukaszb/vim-web-indent'
 " status block
 Bundle 'itchyny/lightline.vim'
 
@@ -68,9 +67,9 @@ Bundle 'juvenn/mustache.vim'
 Bundle 'cakebaker/scss-syntax.vim'
 Bundle 'kchmck/vim-coffee-script'
 Bundle 'vitaly/vim-syntastic-coffee'
+Bundle 'pangloss/vim-javascript'
 Bundle 'mtscout6/vim-cjsx'
 Bundle 'mxw/vim-jsx'
-Bundle 'pangloss/vim-javascript'
 "Bundle 'vim-scripts/jade.vim'
 Bundle 'wavded/vim-stylus'
 Bundle 'VimClojure'

diff --git a/plugins.vim b/plugins.vim
@@ -181,6 +181,10 @@ endfunction
 "pangloss/vim-javascript
 let javascript_enable_domhtmlcss = 1
 
+"""""""""""""""""""""""""""""
+" vim-jsx
+let g:jsx_pragma_required = 1
+
 """""""""""""""""""""""""""""
 " delimitMate
 let g:delimitMate_expand_space = 1 " Turns on/off the expansion of <Space>