consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflicts fixed 2

Browse Source
This commit is contained in:
Ana
2015-12-01 23:11:18 +01:00
parent 2371467b6d
commit c9136807ff
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README_ES.md
View File

@@ -27,10 +27,8 @@ Las herramientas utilizadas para el frontend no están cerradas aún. Los estilo
Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.3, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior). Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.3, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior).
``` ```
<<<<<<< HEAD
git clone https://github.com/consul/consul.git git clone https://github.com/consul/consul.git
=======
>>>>>>> upstream/master
cd consul cd consul
bundle install bundle install
cp config/database.yml.example config/database.yml cp config/database.yml.example config/database.yml