From c337e9630fe49cb21edd093b320d03865eda3589 Mon Sep 17 00:00:00 2001
From: aadi58002 <aadi58002@gmail.com>
Date: Sun, 12 Nov 2023 17:06:05 +0530
Subject: [PATCH] podman: update to 4.7.2

---
 srcpkgs/podman/template | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/podman/template b/srcpkgs/podman/template
index 04b2b9c38bad4..89ea35435a4b7 100644
--- a/srcpkgs/podman/template
+++ b/srcpkgs/podman/template
@@ -1,7 +1,7 @@
 # Template file for 'podman'
 pkgname=podman
-version=4.5.1
-revision=2
+version=4.7.2
+revision=1
 build_style=go
 go_import_path="github.com/containers/podman/v4"
 go_package="${go_import_path}/cmd/podman ${go_import_path}/cmd/rootlessport"
@@ -16,7 +16,11 @@ license="Apache-2.0"
 homepage="https://podman.io/"
 changelog="https://raw.githubusercontent.com/containers/podman/main/RELEASE_NOTES.md"
 distfiles="https://github.com/containers/podman/archive/v${version}.tar.gz"
+<<<<<<< HEAD
 checksum=ee2c8b02b7fe301057f0382637b995a9c6c74e8d530692d6918e4c509ade6e39
+=======
+checksum=10346c5603546427bd809b4d855d1e39b660183232309128ad17a64969a0193d
+>>>>>>> 24df81ad2e2 (podman: update to 4.7.2)
 
 if [ "$CROSS_BUILD" ]; then
 	go_build_tags+=" containers_image_openpgp"