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: John Heidemann To: git-commits@fedoraproject.org Subject: [rpms/perl-Fsdb] epel10: fix conflict in changelog Date: Tue, 09 Jun 2026 17:51:42 GMT Message-ID: <178102750208.1.14796252858671934236.rpms-perl-Fsdb-34118264ad10@fedoraproject.org> List-ID: X-Git-Repo: rpms/perl-Fsdb X-Git-Branch: epel10 X-Git-Rev: 34118264ad10a3abc3db7a6380bd5bb0c74437bf QSBuZXcgY29tbWl0IGhhcyBiZWVuIHB1c2hlZC4KClJlcG8gICA6IHJwbXMvcGVybC1Gc2RiCkJy YW5jaCA6IGVwZWwxMApDb21taXQgOiAzNDExODI2NGFkMTBhM2FiYzNkYjdhNjM4MGJkNWJiMGM3 NDQzN2JmCkF1dGhvciA6IEpvaG4gSGVpZGVtYW5uIDxqb2huaEBpc2kuZWR1PgpEYXRlICAgOiAy MDE5LTA3LTEwVDEwOjQ5OjE2LTA3OjAwClN0YXRzICA6ICswLy0xOCBpbiAxIGZpbGUocykKVVJM ICAgIDogaHR0cHM6Ly9zcmMuZmVkb3JhcHJvamVjdC5vcmcvcnBtcy9wZXJsLUZzZGIvYy8zNDEx ODI2NGFkMTBhM2FiYzNkYjdhNjM4MGJkNWJiMGM3NDQzN2JmP2JyYW5jaD1lcGVsMTAKCkxvZzoK Zml4IGNvbmZsaWN0IGluIGNoYW5nZWxvZwoKLS0tCmRpZmYgLS1naXQgYS9wZXJsLUZzZGIuc3Bl YyBiL3BlcmwtRnNkYi5zcGVjCmluZGV4IDc5OTdhMjQuLjQwYmYwYzggMTAwNjQ0Ci0tLSBhL3Bl cmwtRnNkYi5zcGVjCisrKyBiL3BlcmwtRnNkYi5zcGVjCkBAIC0xMDUsMjMgKzEwNSw1IEBAIG1h a2UgdGVzdAogCiAKICVjaGFuZ2Vsb2cKLTw8PDw8PDwgSEVBRAogKiBXZWQgSnVsIDEwIDIwMTkg Sm9obiBIZWlkZW1hbm4gPGpvaG5oQGlzaS5lZHU+IDIuNjctMQotPT09PT09PQotKiBGcmkgTWF5 IDMxIDIwMTkgSml0a2EgUGxlc25pa292YSA8anBsZXNuaWtAcmVkaGF0LmNvbT4gLSAyLjY2LTMK LS0gUGVybCA1LjMwIHJlYnVpbGQKLQotKiBGcmkgRmViIDAxIDIwMTkgRmVkb3JhIFJlbGVhc2Ug RW5naW5lZXJpbmcgPHJlbGVuZ0BmZWRvcmFwcm9qZWN0Lm9yZz4gLSAyLjY2LTIKLS0gUmVidWls dCBmb3IgaHR0cHM6Ly9mZWRvcmFwcm9qZWN0Lm9yZy93aWtpL0ZlZG9yYV8zMF9NYXNzX1JlYnVp bGQKLQotKiBUaHUgRGVjIDIwIDIwMTggSm9obiBIZWlkZW1hbm4gPGpvaG5oQGlzaS5lZHU+IDIu NjYtMQotCi0qIEZyaSBKdWwgMTMgMjAxOCBGZWRvcmEgUmVsZWFzZSBFbmdpbmVlcmluZyA8cmVs ZW5nQGZlZG9yYXByb2plY3Qub3JnPiAtIDIuNjUtMwotLSBSZWJ1aWx0IGZvciBodHRwczovL2Zl ZG9yYXByb2plY3Qub3JnL3dpa2kvRmVkb3JhXzI5X01hc3NfUmVidWlsZAotCi0qIEZyaSBKdW4g MjkgMjAxOCBKaXRrYSBQbGVzbmlrb3ZhIDxqcGxlc25pa0ByZWRoYXQuY29tPiAtIDIuNjUtMgot LSBQZXJsIDUuMjggcmVidWlsZAotCi0qIEZyaSBGZWIgMTYgMjAxOCBKb2huIEhlaWRlbWFubiA8 am9obmhAaXNpLmVkdT4gMi42NS0xCi0+Pj4+Pj4+IDc2ODhiYzlmMjI3ZWNiYjI1NDc0MDQwYmY2 Njk2NWI3MGY3ZGU3MjMKIC0gU2VlIGh0dHA6Ly93d3cuaXNpLmVkdS9+am9obmgvU09GVFdBUkUv RlNEQi8K