Merge branch 'master' of git.coding.net:linklink/mynote

2018-10-15 17:11:22 +08:00 · 2018-10-15 17:11:22 +08:00 · 99393e0eb7
commit 99393e0eb7
parent 98d2507d87 ac7b599352
2 changed files with 2 additions and 2 deletions
--- a/gfw/shadowsockes.md
+++ b/gfw/shadowsockes.md
@ -89,7 +89,7 @@ haproxy -f /etc/haproxy/haproxy.cfg
 ``` bash

 git clone https://github.com/rofl0r/proxychains-ng.git
-cd proxychain
+cd proxychains-ng
 make
 make install
 make install-config
--- a/vim/vimrc
+++ b/vim/vimrc
@ -130,7 +130,7 @@ set tabstop=4
 set softtabstop=4
 set shiftwidth=4
 " 不要用空格代替制表符
-set noexpandtab
+set expandtab
 " 在行和段开始处使用制表符
 set smarttab
 " 显示行号