From c729b06a29d4fc743a22b7a3fd8db2ebbc5adf9c Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 9 Oct 2017 07:50:14 -0700
Subject: [PATCH] Resolve conflicts with doc/update/mysql_to_postgresql.md
---
doc/update/mysql_to_postgresql.md | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/doc/update/mysql_to_postgresql.md b/doc/update/mysql_to_postgresql.md
index 1d2d49359e80..96c1bd52607c 100644
--- a/doc/update/mysql_to_postgresql.md
+++ b/doc/update/mysql_to_postgresql.md
@@ -44,19 +44,11 @@ Here's what you'll need to have installed:
sudo gitlab-ctl reconfigure
```
-<<<<<<< HEAD
-1. Start Unicorn and PostgreSQL so that we could prepare the schema:
-
- ``` bash
- sudo gitlab-ctl start unicorn
- sudo gitlab-ctl start posgresql
-=======
1. Start Unicorn and PostgreSQL so that we can prepare the schema:
``` bash
sudo gitlab-ctl start unicorn
sudo gitlab-ctl start postgresql
->>>>>>> ce-com/master
```
1. Run the following commands to prepare the schema:
@@ -65,7 +57,6 @@ Here's what you'll need to have installed:
sudo gitlab-rake db:create db:migrate
```
-<<<<<<< HEAD
1. Stop Unicorn in case it's interfering the next step:
``` bash
@@ -325,6 +316,5 @@ If you experience 500 errors after the migration, try to clear the cache:
``` bash
sudo gitlab-rake cache:clear
```
->>>>>>> ce-com/master
[reconfigure GitLab]: ../administration/restart_gitlab.md#omnibus-gitlab-reconfigure
--
GitLab