From c1dc07dab0f77333cc3f3cdacc3afe3637a2e600 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yroblamo@redhat.com>
Date: Mon, 18 Mar 2019 16:20:11 +0100
Subject: [PATCH] Fix bug in README

Change-Id: I63502dea9556aca9df3ac0112ad0adb0f84c3490
---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 90a3a9f..c11f7a4 100644
--- a/README.md
+++ b/README.md
@@ -170,11 +170,8 @@ For the installer to work on baremetal, it needs a different type of images: ins
 
     make images
 
-<<<<<<< HEAD
-=======
 By default it will generate RHCOS Maipo images. But ootpa can be generated by:
 
     make images RHCOS_VERSION=ootpa
 
->>>>>>> 10f8945... Add command to build images
 And this will leave the needed images inside your build directory. Those can be used later for a baremetal deploy.
-- 
2.16.6