summaryrefslogtreecommitdiff
path: root/virtual/libffi/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'virtual/libffi/Manifest')
-rw-r--r--virtual/libffi/Manifest4
1 files changed, 4 insertions, 0 deletions
diff --git a/virtual/libffi/Manifest b/virtual/libffi/Manifest
index d47b6d78b600..90612b7122df 100644
--- a/virtual/libffi/Manifest
+++ b/virtual/libffi/Manifest
@@ -1,5 +1,9 @@
EBUILD libffi-3.0.10.ebuild 600 BLAKE2B 0c6732b0db5ba900f94ae65aae06c196efe64d70fd895aaf58d666bb3d9a43e8a217a0fae75554568ec8c7f44e8fc3b97256d59873ab27c3c3fdae5b6019c9e4 SHA512 4816f4904e24674caea50e8a0ae621a70a53fe2635a91d6e1e3354f35b93d1cb94c0eb92c52b31ce8fe61a5df804e8ab7b2e1cc352f123bc19320b325189002e
EBUILD libffi-3.0.11.ebuild 601 BLAKE2B be01a763073cd8874f1c3ec07dcd0b9058536f43cc3adf9da5f5e893bffabd37a99971ef52c3dbd6e70db62595fbfe306094a54ae1b616a4a45c291f80fc6e62 SHA512 6651fd8cec053b59ea1297945bc590da58f147fc4d6fed6dcb2b08f8fc9b6277dc5a4124293fea79c2ffdcf85efdd1b799701fd10f84d6e64ad1829445b84cd8
EBUILD libffi-3.0.13-r1.ebuild 676 BLAKE2B 75a53a2cfe5ea7056c115adb95b980233fad60397c6e5b152b12d4214b0c4866181e48d8cb2ff4ca5868538cc3e46def2dc22c7b77f20b1d613844037c7b0b23 SHA512 e4a943c879412c740720192c9f659ff339226536fcc08b6df0d61845317cea622b24f0aa35071eae8ee8d507e44bad131aae3cd84a31aedb2ba916652d1a61df
+<<<<<<< HEAD
EBUILD libffi-3.3_rc0.ebuild 716 BLAKE2B 04cbe11690a0db5e5d857f06ba10e8d4cab169b5ab846eb52d3161ff6ce1ba6e94f38d8e2886374057988cf812731f3018d9d6e745f2b354464a04fe12c57430 SHA512 c955a86ea696f7da5920824e98fb83231395dae6258b0d05adfa421f56d3c057b68890fc0cb216fb23c0b8038a0b45b8f43898489342ad55ceee733b7b7f73fa
+=======
+EBUILD libffi-3.3_rc0.ebuild 714 BLAKE2B 32c0be2aded325b77a03faa04bf061322bc54a1a501f2c13048b0b5c1e80bdd70c65320067521d4077febed399a539644d8fddd3b1cbd781fe69ddb49bfbcfdc SHA512 e27dffbe1c3281de3aa44de04e9b57827d17572960facb0a963224e0ab24808f4d6de8c85d7753343b68b6811e02c2333df3bb8bf583f5bd30289ae5fc3f9459
+>>>>>>> next
MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d