summaryrefslogtreecommitdiff
path: root/dev-libs/efl/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'dev-libs/efl/Manifest')
-rw-r--r--dev-libs/efl/Manifest5
1 files changed, 5 insertions, 0 deletions
diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest
index 9e47ebe611ec..09c3fe5ed709 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -1,5 +1,10 @@
DIST efl-1.22.2.tar.xz 71320272 BLAKE2B b1eb66228ec5a92f5d89bf38d95439f9bfb0b09a074e418094474d7c7d0de6a4ae998321a02273a5c9bbcfcba260a7ff3d8cef0af445293869c82c57dec2cca0 SHA512 7385b1fdeee0a4565a0765fedbe5cecca81b86b306ee95a703b3064a88427ab0b4967f6f075a92f5c1d5911cefc56a9c2d45c7347572480169e3f53348321734
DIST efl-1.22.5.tar.xz 71358856 BLAKE2B d1b9c8263608bca61760adb129eb5ad3d507caaa2d4e03847d9c06c99494d6dcaa0756368f700fde64d15dd33147a1f58f5391164902c1f9f586ef7307b14510 SHA512 87d10ab244778fc8452ea85cbf698a6b0ccd065964941f7c04d073cf7db9632b09d7956d86bd5c4e9fa102efceb1057269322e84504c70ee5f740176cd4bb26f
+<<<<<<< HEAD
EBUILD efl-1.22.2.ebuild 6877 BLAKE2B 5569c1e68c66b5bf103f71e526eadd1ea58ead7e37d2cfa367a557bbfbfa3e0764a81338ee8f046a988984540c0a875b79097f62661fe567dfea7df7fb723cb6 SHA512 c1bb384fc318c85a7cefe6cd68c0f776f7319ff80c98389907e373f1880c00c1ce1f50befe097c207c227da87978e19c5031b590e0773ea395395f7c5a271369
EBUILD efl-1.22.5.ebuild 6879 BLAKE2B 7d51377cfb1356054b7ab9562d77d8310591625b2af614e4cd99067eafa8f170cfb2fd66fca2e311bdc4f688aa48b61b15b7f65591810b8510d5e83797ab8bf1 SHA512 e8ce2178fd494b7e701e4e56d70573439db2ff1a6eddbbaf89b111a6b3388af49bf98367563a0c131c55a46c6df4bc982dd4582caf1110d8117ddfd35aa55d3f
+=======
+EBUILD efl-1.22.2.ebuild 6917 BLAKE2B e72f02cdd98c2b951dc29df62c53d2b4d964466a7e77e0612503649c2176bfb7c462e4f9442ad71337b008e143e04e199401573996b06dce37e26ac3640834b5 SHA512 85f8cf01985e23021383937b402097f9f4c2439398c3b4bab96ef031a620bdc8af54e2f3bc8bb87dda1e94b204a5f48c6d6738d73c5238e718bb1ee82e20b172
+EBUILD efl-1.22.5.ebuild 6919 BLAKE2B 3395a373c722c55f3ee8cb0c9a04b2433e158c60cd864a58767f5755a4134dd053cd0f5e0b5c26f666e06b53482aa6ff91ef4521505b8caa7f0d8a591e8c0fd2 SHA512 aeb44bfa0c2c7ac110cff54f4f462fe8f1bf7d20fa35ae1a6a9526cd18d541574f2fe3a5667f4f4bba6080e713afec15afea817fa7fdecac2cea5e996652b759
+>>>>>>> next
MISC metadata.xml 1920 BLAKE2B 01decb622aae3e01bf59d93d48b4babc5e2f63a1499f0daeedd1e9b513f2e7a41819caf3a8f738d49333a2b538d3231d0355ed216edb6313e0c587281f4a9bfe SHA512 ae1c2f5791cf991940eff5333747cd3591b8d03048b99fe4ff1acf442c964f7e56ff0de60cc275205f871b937ef369e9e24342368e69c565fc2efe87931df5b4