From cf62f89c5e1e0bf53b0d3995344ae1f5e0e8a5afb9e0e954625f57b737b80917 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Fri, 17 Dec 2021 10:03:20 +0000 Subject: [PATCH] - Tidy up merge marker OBS-URL: https://build.opensuse.org/package/show/devel:kubic/kubernetes1.22?expand=0&rev=10 --- kubernetes1.22.changes | 5 +++++ kubernetes1.22.spec | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/kubernetes1.22.changes b/kubernetes1.22.changes index ac59723..a033b9c 100644 --- a/kubernetes1.22.changes +++ b/kubernetes1.22.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Dec 17 10:02:26 UTC 2021 - Richard Brown + +- Tidy up merge marker + ------------------------------------------------------------------- Wed Dec 08 15:23:39 UTC 2021 - rbrown@suse.com diff --git a/kubernetes1.22.spec b/kubernetes1.22.spec index 1413ef4..728e14e 100644 --- a/kubernetes1.22.spec +++ b/kubernetes1.22.spec @@ -68,14 +68,8 @@ management of containerized applications. It groups containers that make up an application into logical units for management and discovery. -<<<<<<< .mine - - -======= - ->>>>>>> .new - # packages to build containerized control plane + %package apiserver Summary: Kubernetes apiserver for container image Group: System/Management