summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cobbler.spec1
1 files changed, 0 insertions, 1 deletions
diff --git a/cobbler.spec b/cobbler.spec
index 37dce30..8641f91 100644
--- a/cobbler.spec
+++ b/cobbler.spec
@@ -4,7 +4,6 @@ Name: cobbler
AutoReq: no
Version: 1.0.0
Release: 1%{?dist}
->>>>>>> devel:cobbler.spec
Source0: %{name}-%{version}.tar.gz
License: GPLv2+
Group: Applications/System