From mboxrd@z Thu Jan  1 00:00:00 1970
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: base64
From: Dave Dykstra <2129743+DrDaveD@users.noreply.github.com>
To: git-commits@fedoraproject.org
Subject: [rpms/apptainer] f45: fix merge error
Date: Tue, 22 Sep 2026 17:03:59 GMT
Message-ID: <179009663997.1.7503760715802307308.rpms-apptainer-abf1fe101059@fedoraproject.org>
List-ID: <git-commits.fedoraproject.org>
X-Git-Repo: rpms/apptainer
X-Git-Branch: f45
X-Git-Rev: abf1fe1010599f8229932d40020cd3f1863a89cd

QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvYXBwdGFpbmVyCkJy
YW5jaCA6IGY0NQpDb21taXQgOiBhYmYxZmUxMDEwNTk5ZjgyMjk5MzJkNDAwMjBjZDNmMTg2M2E4
OWNkCkF1dGhvciA6IERhdmUgRHlrc3RyYSA8MjEyOTc0MytEckRhdmVEQHVzZXJzLm5vcmVwbHku
Z2l0aHViLmNvbT4KRGF0ZSAgIDogMjAyNi0wOS0yMlQxMjowMzo1My0wNTowMApTdGF0cyAgOiAr
MS8tMSBpbiAxIGZpbGUocykKVVJMICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcv
cnBtcy9hcHB0YWluZXIvYy9hYmYxZmUxMDEwNTk5ZjgyMjk5MzJkNDAwMjBjZDNmMTg2M2E4OWNk
P2JyYW5jaD1mNDUKCkxvZzoKZml4IG1lcmdlIGVycm9yCgotLS0KZGlmZiAtLWdpdCBhL2FwcHRh
aW5lci5zcGVjIGIvYXBwdGFpbmVyLnNwZWMKaW5kZXggNjdlMGEzNS4uNzc3ZjVhZiAxMDA2NDQK
LS0tIGEvYXBwdGFpbmVyLnNwZWMKKysrIGIvYXBwdGFpbmVyLnNwZWMKQEAgLTM0LDcgKzM0LDcg
QEAKICVnbG9iYWwgZTJmc3Byb2dzX3ZlcnNpb24gMS40Ny40CiAlZ2xvYmFsIGZ1c2Vfb3Zlcmxh
eWZzX3ZlcnNpb24gMS4xNgogJWdsb2JhbCBzcXVhc2hmc190b29sc192ZXJzaW9uIDQuNy41Ci0l
aWZuYXJjaCBwcGM2NGxlIHMzOTB4CislaWZuYXJjaCBwcGM2NGxlIHMzOTB4IHJpc2N2NjQKICVp
ZiAhKDAlez9mZWRvcmF9ID49IDQ1IHx8IDAlez9yaGVsfSA+PSAxMSkgfHwgIiV7X2FyY2h9IiAh
PSAieDg2XzY0IgogIyBPbiBmZWRvcmE0NSAmIGVwZWwxMSB4ODZfNjQgYnVpbGRpbmcgUFJvb3Qg
ZGllcyB3aXRoCiAjICJyZWxvY2F0aW9uIHRydW5jYXRlZCB0byBmaXQ6IFJfWDg2XzY0X1BDMzIg
YWdhaW5zdCBgLnJvZGF0YSciCg==