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

conflicts fixed

Browse Source
This commit is contained in:
Ana
2015-12-01 23:09:03 +01:00
parent 9c8401008e 9f984879f1
commit 2371467b6d
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Gemfile.lock
View File

@@ -165,11 +165,11 @@ GEM
foundation-rails (5.5.3.2) foundation-rails (5.5.3.2)
railties (>= 3.1.0) railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5) sass (>= 3.3.0, < 3.5)
foundation_rails_helper (1.0.0) foundation_rails_helper (1.1.0)
actionpack (~> 4.1, >= 4.1.1) actionpack (~> 4.1)
activemodel (~> 4.1, >= 4.1.1) activemodel (~> 4.1)
activesupport (~> 4.1, >= 4.1.1) activesupport (~> 4.1)
railties (~> 4.1, >= 4.1.1) railties (~> 4.1)
tzinfo (~> 1.2, >= 1.2.2) tzinfo (~> 1.2, >= 1.2.2)
fuubar (2.0.0) fuubar (2.0.0)
rspec (~> 3.0) rspec (~> 3.0)

3
README_ES.md
View File

@@ -27,7 +27,10 @@ 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