summaryrefslogtreecommitdiff
path: root/x11-wm/enlightenment/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/enlightenment/Manifest')
-rw-r--r--x11-wm/enlightenment/Manifest3
1 files changed, 3 insertions, 0 deletions
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index e140a8aa7768..6703d2d3b0c6 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -5,5 +5,8 @@ DIST enlightenment-0.23.0.tar.xz 26425732 BLAKE2B 2b0bd2f27f5589eb4fa9e1cdd0f271
DIST enlightenment-0.23.1.tar.xz 26426096 BLAKE2B d781dc951ad8eddd90f633b29a6b1180be63e6052a56e60644b4f738f4c0d42617aeb4f7326cf3284d0b331dd87d605fa0625ea6435f4e36b8f5b3ccce82ca53 SHA512 b5b8a34f6abe47d9b23dbcaf09d2f61f74b3f8d5a97b30a9666916b4bd307a45cb2ad874288419ab40ef06fa57c3b7dc15377dd9acaeb6eb71cd8c0c24fc42cb
EBUILD enlightenment-0.22.4-r1.ebuild 2200 BLAKE2B ec7e475f9a23d34b0505fd4e17d105e46f5ff678c9f886458a7b80cfa04e40545435105c495e6d8842a5d89b26babf6ae4d29215d99386d8870eb06952a668b0 SHA512 d538a3ebe011b66d0c81c0f18a3614a418d39f19c43ae30d1991af447eda682a1198437589914561c7367c60b3239e0f7b3504277cad4c770bb1172e152e9fbb
EBUILD enlightenment-0.23.0.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f
+<<<<<<< HEAD
+=======
EBUILD enlightenment-0.23.1.ebuild 2640 BLAKE2B fdf6be1bf27911513b2f3da60df49d1e9facbcd4e4058087304389e8ea8a049812d5884b49864d6e4d582670e449485d3a1db859558eead3b4ac8db6e4d9caae SHA512 011c89856232879d9a5bfb2a43a2d42380741c3eb29ed9093da36364a923c5390b73c56a19b9a5efb97e8ce14f12267901a5f31f3f1a3473363e13569d033f6f
+>>>>>>> next
MISC metadata.xml 802 BLAKE2B b7b4f3531b89d5aa743c0153171fc9c36e732ba609eb7703961fd65780c59662ebf796cd7c822ab3cfeed7198fbf4fe8f9b481755f6ac5792729f30e4cc13c6c SHA512 4634f5d13c9f6ae6a7ddeb2c50e8882fac00ac17de37e8eabc24d5edd2470a5e35ffcf21a885be572d1d55f12610eb7496b39a29aad5b3d5f48e67ec26be884b