Permalink
Browse files

Removing merge conflict remnants in the guides.

  • Loading branch information...
1 parent 631a2d9 commit ae54e41824011692106fe7a27dc0991a6342096d @wangjohn wangjohn committed Aug 21, 2013
Showing with 0 additions and 6 deletions.
  1. +0 −6 guides/source/development_dependencies_install.md
@@ -86,7 +86,6 @@ And if you are on Fedora or CentOS, you're done with
$ sudo yum install sqlite3 sqlite3-devel
```
-<<<<<<< HEAD
If you are on Arch Linux, you will need to run:
```bash
@@ -101,8 +100,6 @@ For FreeBSD users, you're done with:
Or compile the `databases/sqlite3` port.
-=======
->>>>>>> ec8ef1e1055c4e1598da13f49d30261f07f4a9b4
Get a recent version of [Bundler](http://gembundler.com/)
```bash
@@ -169,7 +166,6 @@ $ sudo yum install mysql-server mysql-devel
$ sudo yum install postgresql-server postgresql-devel
```
-<<<<<<< HEAD
If you are running Arch Linux, MySQL isn't supported anymore so you will need to
use MariaDB instead (see [this announcement](https://www.archlinux.org/news/mariadb-replaces-mysql-in-repositories/)):
@@ -189,8 +185,6 @@ Or install them through ports (they are located under the `databases` folder).
If you run into troubles during the installation of MySQL, please see
[the MySQL documentation](http://dev.mysql.com/doc/refman/5.1/en/freebsd-installation.html).
-=======
->>>>>>> ec8ef1e1055c4e1598da13f49d30261f07f4a9b4
After that, run:
```bash

0 comments on commit ae54e41

Please sign in to comment.