From: "Ronny Gutbrod" <gentoo@tastytea.de>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/p2pool/
Date: Wed, 14 Aug 2024 08:47:21 +0000 (UTC) [thread overview]
Message-ID: <1723625170.d64341f27a7734a3344d0b81b92581b8f9e924f2.tastytea@gentoo> (raw)
commit: d64341f27a7734a3344d0b81b92581b8f9e924f2
Author: tea <gentoo <AT> tastytea <DOT> de>
AuthorDate: Wed Aug 14 08:46:10 2024 +0000
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
CommitDate: Wed Aug 14 08:46:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d64341f2
net-p2p/p2pool: fix Manifest
there were some diff markers in it
Signed-off-by: tea <gentoo <AT> tastytea.de>
net-p2p/p2pool/Manifest | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/net-p2p/p2pool/Manifest b/net-p2p/p2pool/Manifest
index 68169a012..d10a9a7b0 100644
--- a/net-p2p/p2pool/Manifest
+++ b/net-p2p/p2pool/Manifest
@@ -1,8 +1,4 @@
-DIST p2pool-4.0_shasums.asc 2038 BLAKE2B f8f20875a9fa4771753b1eade7c609be761f007ac32a0641109d87890bdd7f2123f11a203d56ffcca5b74b16667e0d8288479688938935434b86875c6c72959c SHA512 bf4a933a81ce9bd48bf293a26d3e4e75b82c67fcfd48d79c57dd86aaac2c2cd54def43b47b05222e0b93fd61623d2c116c403531500a93d45059bca4a0dd3cb4
-<<<<<<< Updated upstream
DIST p2pool-4.0.tar.xz 127772256 BLAKE2B 77de14bd19f43483fa7da0e65f8a27d5f6cf8c2daf5d8d5e07be373c752794bd35c421fd812b65328acd22004766ff235e9ad6e7e613d08ca3c27ac95153cbc3 SHA512 ea37993d13342b303902e6aa6acb090a908ba99ae304d9415480ff39a3647c84a963ab80b317c9c78a9f11631e0ca9547a08c6e0c23b83892037b63d4beef7a2
-=======
-DIST p2pool-4.0_source.tar.xz 127772256 BLAKE2B 77de14bd19f43483fa7da0e65f8a27d5f6cf8c2daf5d8d5e07be373c752794bd35c421fd812b65328acd22004766ff235e9ad6e7e613d08ca3c27ac95153cbc3 SHA512 ea37993d13342b303902e6aa6acb090a908ba99ae304d9415480ff39a3647c84a963ab80b317c9c78a9f11631e0ca9547a08c6e0c23b83892037b63d4beef7a2
+DIST p2pool-4.0_shasums.asc 2038 BLAKE2B f8f20875a9fa4771753b1eade7c609be761f007ac32a0641109d87890bdd7f2123f11a203d56ffcca5b74b16667e0d8288479688938935434b86875c6c72959c SHA512 bf4a933a81ce9bd48bf293a26d3e4e75b82c67fcfd48d79c57dd86aaac2c2cd54def43b47b05222e0b93fd61623d2c116c403531500a93d45059bca4a0dd3cb4
DIST p2pool-4.1_shasums.asc 2007 BLAKE2B 29dfa3e0620f1ce88ed4a0dcad45f0d5b0eb00d2dd063fe83feb9d027e8e58b6e15cdc9244832a9d6f406a3ee3c8fe2b710554336b93d5af71d17b17acd3b0f5 SHA512 a17784e5ec3d181c0218016c2bb69b5b467f33eac3dea0a31e146703b02d6de202bc6f6628abda439aa9846b7e86773d0ae1440453d0a9a5532a097ad5d974f8
DIST p2pool-4.1_source.tar.xz 127754740 BLAKE2B 6d46920d5fe116f65950bb9dd2fee7feed45f911817302a6c5047602431febac1abacd508fa6f64a84303014212426994a64a26db124501127aee5aed5da1825 SHA512 c0d90fa6b1390a9e0744772b574ab48f78a95980a263d03970adcf51bf7abdf40cefdcafb95daca16c004674b593647f48960bfc8c2630f4852d1c0a9c3b0bb0
->>>>>>> Stashed changes
next reply other threads:[~2024-08-14 8:47 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-14 8:47 Ronny Gutbrod [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-10-06 1:28 [gentoo-commits] repo/proj/guru:dev commit in: net-p2p/p2pool/ Adam Pimentel
2024-08-16 1:50 Lucio Sauer
2024-08-13 0:42 Lucio Sauer
2024-08-01 20:24 Adam Pimentel
2024-07-18 9:19 David Roman
2024-07-16 14:36 Adam Pimentel
2024-01-04 22:51 Adam Pimentel
2023-11-26 21:05 Adam Pimentel
2023-10-31 16:03 Adam Pimentel
2023-10-05 13:18 David Roman
2023-09-30 16:35 Adam Pimentel
2023-09-08 7:40 Adam Pimentel
2023-09-04 17:01 Adam Pimentel
2023-09-01 15:52 Adam Pimentel
2023-08-31 23:53 Adam Pimentel
2023-08-31 23:24 Adam Pimentel
2023-07-01 0:22 Adam Pimentel
2023-06-01 23:50 Adam Pimentel
2023-04-30 17:06 Adam Pimentel
2023-04-01 12:35 Anna Vyalkova
2023-04-01 7:42 Adam Pimentel
2023-03-01 19:20 Adam Pimentel
2023-02-03 4:21 Adam Pimentel
2023-01-27 21:06 Adam Pimentel
2022-12-18 0:08 Adam Pimentel
2022-12-10 7:56 Viorel Munteanu
2022-12-05 17:59 Adam Pimentel
2022-12-05 16:33 Adam Pimentel
2022-12-05 9:20 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2022-12-04 12:37 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2022-12-04 16:56 Adam Pimentel
2022-12-01 14:36 Adam Pimentel
2022-12-01 14:30 Adam Pimentel
2022-12-01 14:30 Adam Pimentel
2022-11-29 13:09 Adam Pimentel
2022-11-28 17:21 Adam Pimentel
2022-11-09 22:45 Adam Pimentel
2022-09-09 22:03 Adam Pimentel
2022-09-09 2:29 Adam Pimentel
2022-09-09 2:29 Adam Pimentel
2022-09-09 2:01 Adam Pimentel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1723625170.d64341f27a7734a3344d0b81b92581b8f9e924f2.tastytea@gentoo \
--to=gentoo@tastytea.de \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox