update

git/install_gitlab.md

@@ -7,6 +7,7 @@
 ## install 
 ``` bash
 $ sudo apt-get install curl openssh-server ca-certificates postfix
+<<<<<<< HEAD
 
 $ curl -LJO https://mirrors.tuna.tsinghua.edu.cn/gitlab-ce/ubuntu/pool/trusty/main/g/gitlab-ce/gitlab-ce_9.2.2-ce.0_amd64.deb
 $ dpkg -i gitlab-ce-XXX.deb
@@ -15,5 +16,9 @@ $ curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/scr
 $ sudo apt-get install gitlab-ce
 
 
+=======
+$ curl -LJO https://mirrors.tuna.tsinghua.edu.cn/gitlab-ce/ubuntu/pool/trusty/main/g/gitlab-ce/gitlab-ce_9.2.2-ce.0_amd64.deb
+$ dpkg -i gitlab-ce_9.2.2-ce.0_amd64.deb
+>>>>>>> 39e9cab6f757d960746af30861ce75e9e2ab2d8d
 $ sudo gitlab-ctl reconfigure
 ```

git/ssh_key.md

@@ -0,0 +1,6 @@
+
+# build ssh key
+
+git config --global user.name 'light'
+git config --global user.name '1870499383@qq.com'
+ssh-keygen -t rsa -C '1870499383@qq.com'