From d24a6c105eba2fb4f1ae23de329ee9378883a690 Mon Sep 17 00:00:00 2001
From: light <1870499383@qq.com>
Date: Wed, 7 Jun 2017 00:01:45 +0800
Subject: [PATCH 1/3] update

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 485dee6..c10666e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .idea
+*.pyc

From 12259ae0025544a408b2a4ddcaefb717b72a1142 Mon Sep 17 00:00:00 2001
From: light <1870499383@qq.com>
Date: Wed, 7 Jun 2017 00:03:54 +0800
Subject: [PATCH 2/3] update

---
 git/install_gitlab.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/git/install_gitlab.md b/git/install_gitlab.md
index ec7bd88..4cc4348 100644
--- a/git/install_gitlab.md
+++ b/git/install_gitlab.md
@@ -7,7 +7,13 @@
 ## install 
 ``` bash
 $ sudo apt-get install curl openssh-server ca-certificates postfix
+
+$ 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
+
 $ curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | sudo bash
 $ sudo apt-get install gitlab-ce
+
+
 $ sudo gitlab-ctl reconfigure
 ```
\ No newline at end of file

From 67fe8864e3290b8db7652664931e7bb0d74bca5c Mon Sep 17 00:00:00 2001
From: light <1870499383@qq.com>
Date: Wed, 7 Jun 2017 00:08:04 +0800
Subject: [PATCH 3/3] bug

---
 git/install_gitlab.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/git/install_gitlab.md b/git/install_gitlab.md
index 21ed43f..ee3a723 100644
--- a/git/install_gitlab.md
+++ b/git/install_gitlab.md
@@ -7,18 +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
-
-$ curl -sS https://packages.gitlab.com/install/repositories/gitlab/gitlab-ce/script.deb.sh | sudo bash
-$ 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
 ```
\ No newline at end of file