On Tue, Oct 14, 2014 at 2:51 AM, Luya Tshimbalanga <luya@fedoraproject.org> wrote:
commit 6e96869ce304327eb980112da6ce05d758820258
Merge: 9142cc2 8d5f9bb
Author: luya <luya@kwetu.telus1603>
Date:   Mon Oct 13 23:50:42 2014 -0700

    design: add LuxRender and YaraRay plugin for Blender

 fedora-cloud-atomic.ks        |   60 ++----------
 fedora-cloud-bigdata.ks       |  219 +++++++++++++++++++++++++++++++++++++++++
 fedora-docker-base.ks         |    3 +
 fedora-install-workstation.ks |    2 +
 fedora-live-design_suite.ks   |    6 +-
 5 files changed, 237 insertions(+), 53 deletions(-)
---
diff --cc fedora-cloud-atomic.ks
index c8caf28,c77ffec..42fed30
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@@ -26,36 -26,12 +26,21 @@@ clearpart --al
  # Atomic differs from cloud - we want LVM
  autopart

++<<<<<<< HEAD
 +ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://compose-x86-02.phx2.fedoraproject.org/compose/atomic/ --ref=fedora-atomic/f21/x86_64/docker-host
 +
 +reboot
 +
 +
 +
- %post --erroronfail
++=======
+ # Equivalent of %include fedora-repo.ks
+ ostreesetup --nogpg --osname=fedora-atomic-host --remote=installmedia --url=http://kojipkgs.fedoraproject.org/mash/atomic/ --ref=fedora-atomic/rawhide/x86_64/docker-host
+

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?

Rich