diff options
| author | wangjohn <wangjohn@mit.edu> | 2013-08-21 16:34:36 -0400 |
|---|---|---|
| committer | wangjohn <wangjohn@mit.edu> | 2013-08-21 16:34:36 -0400 |
| commit | ae54e41824011692106fe7a27dc0991a6342096d (patch) | |
| tree | 585d6ff5256b667efacc2cbf1383308b17847f34 /guides | |
| parent | 631a2d977016df28ccf15f894f78ccaf3dfef913 (diff) | |
| download | rails-ae54e41824011692106fe7a27dc0991a6342096d.tar.gz rails-ae54e41824011692106fe7a27dc0991a6342096d.tar.bz2 rails-ae54e41824011692106fe7a27dc0991a6342096d.zip | |
Removing merge conflict remnants in the guides.
Diffstat (limited to 'guides')
| -rw-r--r-- | guides/source/development_dependencies_install.md | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/guides/source/development_dependencies_install.md b/guides/source/development_dependencies_install.md index 034fef71c8..42340cc2b4 100644 --- a/guides/source/development_dependencies_install.md +++ b/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 |