summaryrefslogtreecommitdiff
path: root/dev-util/bless/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/bless/Manifest')
-rw-r--r--dev-util/bless/Manifest4
1 files changed, 4 insertions, 0 deletions
diff --git a/dev-util/bless/Manifest b/dev-util/bless/Manifest
index 016e97375c6e..97502dd41d1a 100644
--- a/dev-util/bless/Manifest
+++ b/dev-util/bless/Manifest
@@ -5,5 +5,9 @@ DIST bless-0.6.0.tar.gz 745694 BLAKE2B eb23edf3fd9c45b9848810ff022a7e9b7d760c224
DIST bless-0.6.2.tar.gz 514695 BLAKE2B 2c9681e03992d42b20d0073e9107e5bd83d6f1699235b49fb6cf14fb5f9bc87e682e96b4f8bab2b45a3211515a8990e72b80922a62198c7ad603aeb5f3d3c406 SHA512 3fef715ed138323af50437ef8cda3d9f53987498042f1b4df2d9ce23f00dade68147cbdf28b85aed8b9c594fb5c43839c9dedbc14a994ad609fd4cedd89bfcf5
EBUILD bless-0.6.0-r3.ebuild 1189 BLAKE2B b50dc35022a87a974a3f619f9f8eafb3034172dceebdaffb26ecc2955f4e1d5a51ffa02a21317dfe392ea5ef654e476de32c18da14ab922014cd576f9b78bf40 SHA512 2ff6ee1dab86eb242deffe88e36f30bba6584f7b4663728030872a2014b11c8433c45126c78d4bf5af24f6feae3b52dd9f2e39fe9042bd9c601777fa1fed54bc
EBUILD bless-0.6.0-r4.ebuild 1188 BLAKE2B 97f0b498f789a511f4a24d57d23c18254561435cb5e197d94fe2e026e0047e1d7f18bc340a938bf57afa35c14682fb00b7f4c2375af8f61a0c8cceb678a99380 SHA512 652cf121dc16d0e4d745092de05a17f6c2f9adb34ffdc35800893a2ee038dc05a64ad93d66a30311f71cf1a7c2c0c70a5446756756f97a7e7a412091d63fc968
+<<<<<<< HEAD
EBUILD bless-0.6.2.ebuild 1089 BLAKE2B 9f655705a567c69a2918ae0af95a2e3f7862eafa2a4d808606ad75c83dbb6ad69e3abdd34a72e9f8e74a119442905bab41b1648047ffdcc5568bf12407d77310 SHA512 480cc2c321892ee1d49325a4b2686c607a314dd347d3218ae7992fe9af770b3545f8af77bbdeb370166fbc2e4b11a21cc542b15121987e6406c652d36136ae0f
+=======
+EBUILD bless-0.6.2-r1.ebuild 1091 BLAKE2B a26ddc20916d8500116c05252dca058f4145eac973d27e697863984121b3d2f477eade47412deb48cdb918886e7bacb4654946bd6f0ec7c31eaedc5151b66c6f SHA512 def48401109372031c03507ffc869a995d82b93c293b8e10fd503f1d9e87ff00b6988c15a19f774793fe7be1983cc1a4ede0c79c5b894ba0dba9950fc093f5c3
+>>>>>>> next
MISC metadata.xml 242 BLAKE2B 896ec48a498764d193d9e3c54bfc07d07a6f95675e772ff73730bbdfb8cce43d2d1d99fbd0ee96a6c0ad3eab13e6a82bff55ce3a1e5a6883204fe8c5d5932f0f SHA512 c305f98db61dfe31ddc48084c932b6c45eee7a8cd664ebeade704135fb1da0978ace942a2a4d92d418ad4bdd22acd0685864cf0f4297660fc325cd3842e283e9