mirror of
https://pagure.io/fedora-kickstarts.git
synced 2024-11-08 01:14:22 +00:00
Dont know how the merge conflicts got into it, hence reverting the changes Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
This commit is contained in:
parent
742baccab0
commit
f75331262b
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user