From f75331262b9ac35012be1d40234bf3155db9e8ad Mon Sep 17 00:00:00 2001
From: Mohan Boddu <mboddu@bhujji.com>
Date: Mon, 29 Oct 2018 17:02:18 -0400
Subject: [PATCH] Fixing https://pagure.io/fedora-kickstarts/pull-request/450

Dont know how the merge conflicts got into it, hence
reverting the changes

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
---
 fedora-atomic.ks            |  2 +-
 fedora-lxqt-common.ks       |  4 ----
 fedora-scientific-common.ks | 11 -----------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/fedora-atomic.ks b/fedora-atomic.ks
index cde4738..3440aed 100644
--- a/fedora-atomic.ks
+++ b/fedora-atomic.ks
@@ -68,7 +68,7 @@ reboot
 # This location is where the compose gets synced to after the compose
 # is done.
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-30-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299
diff --git a/fedora-lxqt-common.ks b/fedora-lxqt-common.ks
index 730823c..e2acd32 100644
--- a/fedora-lxqt-common.ks
+++ b/fedora-lxqt-common.ks
@@ -27,11 +27,7 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 
-<<<<<<< HEAD
 # Editor
-=======
-# Text Editor
->>>>>>> master
 enki
 
 # remove unneeded stuff to get a lightweight system
diff --git a/fedora-scientific-common.ks b/fedora-scientific-common.ks
index b775757..c033cf2 100644
--- a/fedora-scientific-common.ks
+++ b/fedora-scientific-common.ks
@@ -70,25 +70,14 @@ rkward
 qtoctave
 
 # julia
-<<<<<<< HEAD
 # Comment out till https://koji.fedoraproject.org/koji/buildinfo?buildID=1135023 is fixed
-=======
-# Comment out till build failure is sorted
->>>>>>> master
 # julia
 # julia-doc
 
 # IDEs for the IDE folks
 @eclipse
-<<<<<<< HEAD
 # Workaround for: https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant
-=======
-
-# Workaround for https://pagure.io/releng/issue/7814
--eclipse-linuxtools-vagrant
-
->>>>>>> master
 spyder
 
 #writing & publishing