diff options
| -rw-r--r-- | kernel.spec | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 542b7781a..7f16c66cb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -44,11 +44,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be appended after the rcX and # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3" # -<<<<<<< HEAD %global baserelease 350 -======= -%global baserelease 300 ->>>>>>> origin/f28 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching |