From: Yolanda Robla <yroblamo@redhat.com>
Date: Mon, 18 Mar 2019 15:20:11 +0000 (+0100)
Subject: Fix bug in README
X-Git-Tag: akraino_r1~25
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F82%2F482%2F1;p=kni%2Finstaller.git

Fix bug in README

Change-Id: I63502dea9556aca9df3ac0112ad0adb0f84c3490
---

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.