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: Richard Shaw To: git-commits@fedoraproject.org Subject: [rpms/OpenImageIO] f44: Fix merge conflict. Date: Tue, 02 Jun 2026 02:17:50 GMT Message-ID: <178036667059.1.1397187266313530871.rpms-OpenImageIO-947d9614b483@fedoraproject.org> List-ID: X-Git-Repo: rpms/OpenImageIO X-Git-Branch: f44 X-Git-Rev: 947d9614b48309a85447bfd9fbb640fd54eb2bd1 QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvT3BlbkltYWdlSU8K QnJhbmNoIDogZjQ0CkNvbW1pdCA6IDk0N2Q5NjE0YjQ4MzA5YTg1NDQ3YmZkOWZiYjY0MGZkNTRl YjJiZDEKQXV0aG9yIDogUmljaGFyZCBTaGF3IDxob2JiZXMxMDY5QGdtYWlsLmNvbT4KRGF0ZSAg IDogMjAyNi0wNi0wMVQyMDoyMjoyMS0wNTowMApTdGF0cyAgOiArMTcvLTUgaW4gMyBmaWxlKHMp ClVSTCAgICA6IGh0dHBzOi8vc3JjLmZlZG9yYXByb2plY3Qub3JnL3JwbXMvT3BlbkltYWdlSU8v Yy85NDdkOTYxNGI0ODMwOWE4NTQ0N2JmZDlmYmI2NDBmZDU0ZWIyYmQxP2JyYW5jaD1mNDQKCkxv ZzoKRml4IG1lcmdlIGNvbmZsaWN0LgoKLS0tCmRpZmYgLS1naXQgYS9PcGVuSW1hZ2VJTy5zcGVj IGIvT3BlbkltYWdlSU8uc3BlYwppbmRleCAxNGMzNjg0Li4wNDg3YmY2IDEwMDY0NAotLS0gYS9P cGVuSW1hZ2VJTy5zcGVjCisrKyBiL09wZW5JbWFnZUlPLnNwZWMKQEAgLTQxLDYgKzQxLDcgQEAg QnVpbGRSZXF1aXJlczogIGZtdC1kZXZlbAogQnVpbGRSZXF1aXJlczogIGZyZWV0eXBlLWRldmVs CiBCdWlsZFJlcXVpcmVzOiAgZ2lmbGliLWRldmVsCiBCdWlsZFJlcXVpcmVzOiAgZ2xldy1kZXZl bAorQnVpbGRSZXF1aXJlczogIGltYXRoLWRldmVsCiAjIE9ubHkgYXZhaWxhYmxlIG9uIFJQTSBG dXNpb24KIEJ1aWxkUmVxdWlyZXM6ICBsaWJoZWlmLWRldmVsCiBCdWlsZFJlcXVpcmVzOiAgbGli dWx0cmFoZHItZGV2ZWwKQEAgLTIwMywxMCArMjA0LDE4IEBAIGNwIC1hIHNyYy9kb2MvKi4xICV7 YnVpbGRyb290fSV7X21hbmRpcn0vbWFuMQogJXtfaW5jbHVkZWRpcn0vJXtuYW1lfS8KIAogCi0l Y2hhbmdlbG9nCiAqIFR1ZSBKdW4gMDIgMjAyNiBSaWNoYXJkIFNoYXcgPGhvYmJlczEwNjlAZ21h aWwuY29tPiAtIDE6My4xLjE0LjAtMQogLSBVcGRhdGUgdG8gMy4xLjE0LjAuCiAKKyogU2F0IE1h eSAzMCAyMDI2IFJpY2hhcmQgU2hhdyA8aG9iYmVzMTA2OUBnbWFpbC5jb20+IC0gMTozLjEuMTIu MC01CistIFJlYnVpbGQgZm9yIE9wZW5Db2xvcklPIDIuNS4yLgorCisqIE1vbiBNYXkgMjUgMjAy NiBSaWNoYXJkIFNoYXcgPGhvYmJlczEwNjlAZ21haWwuY29tPiAtIDE6My4xLjEyLjAtNAorLSBS ZWJ1aWxkIGZvciBPcGVuRVhSIDMuNC4xMi4KKworKiBTYXQgTWF5IDAyIDIwMjYgU2ltb25lIENh cm9ubmkgPG5lZ2F0aXZvMTdAZ21haWwuY29tPiAtIDE6My4xLjEyLjAtMworLSBSZWJ1aWxkIGZv ciBPcGVuSlBIIHVwZGF0ZS4KKwogKiBXZWQgQXByIDA4IDIwMjYgR3d5biBDaWVzbGEgPGd3eW5j QHByb3Rvbm1haWwuY29tPiAtIDE6My4xLjEyLjAtMgogLSBMaWJyYXcgcmVidWlsZAogCgpkaWZm IC0tZ2l0IGEvLmdpdGlnbm9yZSBiLy5naXRpZ25vcmUKaW5kZXggOWRkYTNlYS4uNWZlZDFiNiAx MDA2NDQKLS0tIGEvLmdpdGlnbm9yZQorKysgYi8uZ2l0aWdub3JlCkBAIC0xMzYsMyArMTM2LDQg QEAgY2xvZwogL09wZW5JbWFnZUlPLTMuMS44LjAudGFyLmd6CiAvT3BlbkltYWdlSU8tMy4xLjku MC50YXIuZ3oKIC9PcGVuSW1hZ2VJTy0zLjEuMTIuMC50YXIuZ3oKKy9PcGVuSW1hZ2VJTy0zLjEu MTQuMC50YXIuZ3oKCmRpZmYgLS1naXQgYS9PcGVuSW1hZ2VJTy5zcGVjIGIvT3BlbkltYWdlSU8u c3BlYwppbmRleCA1MGFiYjY2Li4wNDg3YmY2IDEwMDY0NAotLS0gYS9PcGVuSW1hZ2VJTy5zcGVj CisrKyBiL09wZW5JbWFnZUlPLnNwZWMKQEAgLTIsOCArMiw4IEBACiAlZ2xvYmFsIHNvdmVyIDMu MQogCiBOYW1lOiAgICAgICAgICAgT3BlbkltYWdlSU8KLVZlcnNpb246ICAgICAgICAzLjEuMTIu MAotUmVsZWFzZTogICAgICAgIDUlez9kaXN0fQorVmVyc2lvbjogICAgICAgIDMuMS4xNC4wCitS ZWxlYXNlOiAgICAgICAgMSV7P2Rpc3R9CiBFcG9jaDogICAgICAgICAgMQogU3VtbWFyeTogICAg ICAgIExpYnJhcnkgZm9yIHJlYWRpbmcgYW5kIHdyaXRpbmcgaW1hZ2VzCiAKQEAgLTIwNCw3ICsy MDQsOSBAQCBjcCAtYSBzcmMvZG9jLyouMSAle2J1aWxkcm9vdH0le19tYW5kaXJ9L21hbjEKICV7 X2luY2x1ZGVkaXJ9LyV7bmFtZX0vCiAKIAotJWNoYW5nZWxvZworKiBUdWUgSnVuIDAyIDIwMjYg UmljaGFyZCBTaGF3IDxob2JiZXMxMDY5QGdtYWlsLmNvbT4gLSAxOjMuMS4xNC4wLTEKKy0gVXBk YXRlIHRvIDMuMS4xNC4wLgorCiAqIFNhdCBNYXkgMzAgMjAyNiBSaWNoYXJkIFNoYXcgPGhvYmJl czEwNjlAZ21haWwuY29tPiAtIDE6My4xLjEyLjAtNQogLSBSZWJ1aWxkIGZvciBPcGVuQ29sb3JJ TyAyLjUuMi4KIAoKZGlmZiAtLWdpdCBhL3NvdXJjZXMgYi9zb3VyY2VzCmluZGV4IGU5M2NmYjYu LmExNDg1ZGUgMTAwNjQ0Ci0tLSBhL3NvdXJjZXMKKysrIGIvc291cmNlcwpAQCAtMSArMSBAQAot U0hBNTEyIChPcGVuSW1hZ2VJTy0zLjEuMTIuMC50YXIuZ3opID0gZDAwODc3YzFiY2E4YzVjYTE5 ZTQ1MzQ3ODc3ODNhMTJjODkyMjE1NDAzMjgyNDI1ZDE2ODU5MjBiNWY0MjRiNmZhYzIxN2YwNDky NDNjMjEwNmU1ZDk4MWM3NTA4MTE1MTQ1ZTA4Y2U1YzVkZDc4NjMzMDczYzFkZGQ4ODNmM2UKK1NI QTUxMiAoT3BlbkltYWdlSU8tMy4xLjE0LjAudGFyLmd6KSA9IGRkNWNiMzBlZGY4ZDZjMmQ2MTI2 MGNjMmQ5MWE3YTI5YmJhZDExYjE4ZjgzYWY5MzUyN2Y5MzA4YmZmMGUyNGIyMTg1ODQ2MzVmZGFk NmExNTRhMmMzMmYwYzhjMTJhNDU4YTg2MjYxYzc2YzM2ZDlhYTQxMTA2YWY4NTMzYTM5Cg==