From c9136807ff5493f3132d95248a2a0bf2e6c780d3 Mon Sep 17 00:00:00 2001
From: Ana <anamma06@gmail.com>
Date: Tue, 1 Dec 2015 23:11:18 +0100
Subject: [PATCH] conflicts fixed 2

---
 README_ES.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README_ES.md b/README_ES.md
index 8fd1dd2f1..27c760c3e 100644
--- a/README_ES.md
+++ b/README_ES.md
@@ -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).
 
 ```
-<<<<<<< HEAD
+
 git clone https://github.com/consul/consul.git
-=======
->>>>>>> upstream/master
 cd consul
 bundle install
 cp config/database.yml.example config/database.yml