mirror of
https://github.com/amix/vimrc
synced 2025-07-09 02:25:00 +08:00
Merge branch 'master' of https://github.com/wonyeouuu/vimrc
This commit is contained in:
@ -12,6 +12,10 @@ This is the vim configurations based on [amix/vimrc](https://github.com/amix/vim
|
|||||||
|
|
||||||
* Add [easymotion](https://github.com/easymotion/vim-easymotion) for (IMHO) better development experience.
|
* Add [easymotion](https://github.com/easymotion/vim-easymotion) for (IMHO) better development experience.
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
* Change [lightline](https://github.com/itchyny/lightline.vim) to [vim-airline](https://github.com/vim-airline/vim-airline).
|
* Change [lightline](https://github.com/itchyny/lightline.vim) to [vim-airline](https://github.com/vim-airline/vim-airline).
|
||||||
|
|
||||||
Detail changes can be found in [./my_config.vim](./my_config.vim) and [./my_plugins](./my_plugins).
|
Detail changes can be found in [./my_config.vim](./my_config.vim) and [./my_plugins](./my_plugins).
|
||||||
|
=======
|
||||||
|
Detail changes can be found in [./my_configs.vim](./my_configs.vim) and [./my_plugins](./my_plugins).
|
||||||
|
>>>>>>> 0143ba686b069e6884e88663ee27c5783af356b0
|
||||||
|
Reference in New Issue
Block a user