<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Tue, Oct 14, 2014 at 2:51 AM, Luya Tshimbalanga <span dir="ltr"><<a href="mailto:luya@fedoraproject.org" target="_blank">luya@fedoraproject.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">commit 6e96869ce304327eb980112da6ce05d758820258<br>
Merge: 9142cc2 8d5f9bb<br>
Author: luya <luya@kwetu.telus1603><br>
Date: Mon Oct 13 23:50:42 2014 -0700<br>
<br>
design: add LuxRender and YaraRay plugin for Blender<br>
<br>
fedora-cloud-atomic.ks | 60 ++----------<br>
fedora-cloud-bigdata.ks | 219 +++++++++++++++++++++++++++++++++++++++++<br>
fedora-docker-base.ks | 3 +<br>
fedora-install-workstation.ks | 2 +<br>
fedora-live-design_suite.ks | 6 +-<br>
5 files changed, 237 insertions(+), 53 deletions(-)<br>
---<br>
diff --cc fedora-cloud-atomic.ks<br>
index c8caf28,c77ffec..42fed30<br>
--- a/fedora-cloud-atomic.ks<br>
+++ b/fedora-cloud-atomic.ks<br>
@@@ -26,36 -26,12 +26,21 @@@ clearpart --al<br>
# Atomic differs from cloud - we want LVM<br>
autopart<br>
<br>
++<<<<<<< HEAD<br>
+ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=<a href="http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/" target="_blank">http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/</a> --ref=fedora-atomic/f21/x86_64/docker-host<br>
+<br>
+reboot<br>
+<br>
+<br>
+<br>
- %post --erroronfail<br>
++=======<br>
+ # Equivalent of %include fedora-repo.ks<br>
+ ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=<a href="http://kojipkgs.fedoraproject.org/mash/atomic/" target="_blank">http://kojipkgs.fedoraproject.org/mash/atomic/</a> --ref=fedora-atomic/rawhide/x86_64/docker-host<br>
+<br></blockquote><div><br></div><div>What's going on here, it looks like this is an incomplete merge. Did you mean to merge all 62 of these commits from the master branch into f21, or just the last commit? <br><br></div><div>Rich<br></div></div></div></div>