summaryrefslogtreecommitdiff
path: root/mail-client/mutt/Manifest
diff options
context:
space:
mode:
Diffstat (limited to 'mail-client/mutt/Manifest')
-rw-r--r--mail-client/mutt/Manifest5
1 files changed, 5 insertions, 0 deletions
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index d848c0020111..2ff4440fbcc5 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -10,6 +10,11 @@ DIST mutt-gentoo-1.12.1-patches-r0.tar.xz 106064 BLAKE2B 60b73bcfd9713261c7b88fe
DIST mutt-gentoo-1.12.2-patches-r0.tar.xz 106384 BLAKE2B 9329c3629d4c8d34e42a422e76dc0ec0f3a4b697fc59586c0258716bb9e4a1ff26cccc20f7ecbc340a92e23b24baa7514041274b3b2b4a73ef9dd36536d8206a SHA512 0aafa589a98e10044a36e578cae5e1e08ae66a0fe773763852441d9410f65f8bf6bd0256e1b0f059bd5ace6fb7ed90f63b5c3dd4b6fbdb6e7c3d2af8a95b266f
EBUILD mutt-1.10.1.ebuild 9182 BLAKE2B 04bc41d9445b10bb829b7506f76e7d47b4c98a08428f7ad4ba693ba3c1badea96dd69c1895fd3ea7953be657d08913d9a56e6b1a62afc07c9848c6768c249007 SHA512 3439e6b15dbc93f99392ae36e0e5bd36f2f987c1ff4fa65d31195543f97b6ef010bdcec9539acf15ffa03190df278f2e31e152e67883e518243bfc39fb4b3287
EBUILD mutt-1.11.4.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
+<<<<<<< HEAD
+EBUILD mutt-1.12.0.ebuild 9465 BLAKE2B 34cdefad0da015cb40cdb2ee86e91751b7d0034bdecb950e575272af64c63a6ae583cba3a7354f7205522abf67b61128f3e6cb83250fab4648352e7d2e820911 SHA512 b4ed87fd162eeee0e29ce6d0882e0359c248e2d46cd9cae2cdc087b1c26804fc3844c45417c9030a4c1acf32c3f8b4897d14c489b9d08b3dd727ff5b1f436d8f
+EBUILD mutt-1.12.1.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf
+=======
EBUILD mutt-1.12.1.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf
EBUILD mutt-1.12.2.ebuild 9503 BLAKE2B 4bbfa37e53ed6e8cb441209125c9b41dbe71cb6a8cf8098076002c58e409ee3b58b4eac01eb6b51c8aff72779d4d1e43d434769fde75f145909709f3d445fc74 SHA512 30aea3779998c9982e0bd8a98c967030c1877fd2b161849636827f57bbed351b34dc73a6ae58e0d0fda43768fd3ecafac8b6b8030c04331dbdf985925faedecf
+>>>>>>> next
MISC metadata.xml 1606 BLAKE2B 4b25867379e06da3cb6cc6500c42c731e18512be107f69df9764689ce2de3741ce235d0f610711e4fbfb256319b1343647075da7808532a63946451f7e6107f5 SHA512 054aee931ba2bffe79982ffbb2f32282f8c7277319915ef55a2a2cd3e39f20b1ab90c664016630aef63f0d325fbd3934336f0d5bb25ff610ecb26fc9f9fc66d1