From a2e5a8591812ee38261065514095e790ca7a7769 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Thu, 10 Jun 2021 08:54:54 -0400
Subject: [PATCH] Update to grab latest man pages and configuration files, also
 switch to using some main rather then master branches

---
 containers-common.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/containers-common.spec b/containers-common.spec
index 32af23e..f06d5b9 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -5,7 +5,7 @@
 # Buildah/Podman/Skopeo.
 %global skopeo_branch master
 %global podman_branch master
-%global image_branch  master
+%global image_branch  main
 %global common_branch main
 %global storage_branch main
 %global shortnames_branch main
@@ -136,13 +136,11 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %{_datadir}/rhel/secrets/*
 
 %changelog
-<<<<<<< HEAD
 * Thu Jun 10 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-19
 - Update to grab latest man pages and configuration files, also switch to using some main rather then master branches
-=======
+
 * Tue May 18 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-19
 - use container-selinux 2.162.1 and use latest configs
->>>>>>> 0f389750defb05318144c76645808719db79b246
 
 * Tue May 11 2021 Dan Walsh <dwalsh@fedoraproject.org> - 4:1-18
 - Update containers.conf to latest, and change default log-driver to journald.