spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf | 1 - 1 file changed, 1 deletion(-)
New commits: commit 7acc632bf2bfe50e0146a31aea5e243440e705ed Author: Devan Goodwin dgoodwin@redhat.com Date: Mon Jul 27 16:07:38 2009 -0300
Leftover conflict marker.
diff --git a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf index 7f600e5..e76b32d 100644 --- a/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf +++ b/spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf @@ -26,7 +26,6 @@ allowed_iss_slaves= # another spacewalk (or hosted). disable_iss=0
->>>>>>> master:spacewalk/config/etc/sysconfig/rhn-satellite-prep/etc/rhn/rhn.conf default_db = @@default_db@@
db_backend = @@db_backend@@
spacewalk-commits@lists.fedorahosted.org