Code Review / kni / installer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 12bdf78)
Fix bug in README 82/482/1
authorYolanda Robla <yroblamo@redhat.com>
Mon, 18 Mar 2019 15:20:11 +0000 (16:20 +0100)
committerYolanda Robla <yroblamo@redhat.com>
Mon, 18 Mar 2019 15:20:42 +0000 (16:20 +0100)
Change-Id: I63502dea9556aca9df3ac0112ad0adb0f84c3490

README.md patch | blob | history

diff --git a/README.md b/README.md
index 90a3a9f..c11f7a4 100644 (file)
--- 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.