public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Aiden Wingard" <kernaltrap@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/ngrok-bin/
Date: Mon, 24 Feb 2025 14:21:06 +0000 (UTC)	[thread overview]
Message-ID: <1740406848.be1f61dca35d778261638a77ff10ffc97617f6d8.kernaltrap@gentoo> (raw)

commit:     be1f61dca35d778261638a77ff10ffc97617f6d8
Author:     kernaltrap <kernaltrap <AT> gmail <DOT> com>
AuthorDate: Mon Feb 24 14:20:48 2025 +0000
Commit:     Aiden Wingard <kernaltrap <AT> gmail <DOT> com>
CommitDate: Mon Feb 24 14:20:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be1f61dc

net-proxy/ngrok-bin-3.20.0: Fix manifest

Signed-off-by: kernaltrap <kernaltrap <AT> gmail.com>

 net-proxy/ngrok-bin/Manifest | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/net-proxy/ngrok-bin/Manifest b/net-proxy/ngrok-bin/Manifest
index d565923ad..3504b5c70 100644
--- a/net-proxy/ngrok-bin/Manifest
+++ b/net-proxy/ngrok-bin/Manifest
@@ -1,12 +1,3 @@
-<<<<<<< Updated upstream
-DIST ngrok-bin-3.19.1-amd64.tgz 14820424 BLAKE2B 1603b5ad867bbcab3abf5a8f6194a26a51e9a80834c3f243f329118b6d481d60b14c1ff27149862056261e04158b0bffd6faeb3714efde2001606f9d74783733 SHA512 74fb6e45d1f217146f13fd935e72ea7254a652d2a0c6dbd1bea697f5ed4b982c862f06ca603dac0e25224ac26040be982eae5c8104f13f66f25a7d1a2deb9174
-DIST ngrok-bin-3.19.1-arm.tgz 14095597 BLAKE2B 7c183dd8499bab616c19f495b98c987afbf65f43d2d3a1f8a0936b07210e3c4eec280cc55a656904f037a6eaf3240af82585714708cf104571d75a0ae9081736 SHA512 87cc095c975b7925a793d708c4e66fd4066bffca4b683b65e71e934272917b9a1ac70ea600c2b7c71cd02ff545c5c73a490b26e8876cf516f6b845619ad0a079
-DIST ngrok-bin-3.19.1-arm64.tgz 13486388 BLAKE2B 5def0565f6276cff80ab5e0956bd938fddd8f42634d2320a5d6cbce780b0575653fb9a3793d81d8e193ad2bb5649b8c22929488c02c7aad64a40e16e70867d4c SHA512 90ff967eaab5534c58db5f1f714f35ccb827792c6e698ee8c4dfb9a069ac3df742cae2991ed4150d83854895e017a6ad35bd01896254b8e8325edb0bce655a77
-DIST ngrok-bin-3.19.1-i386.tgz 13737083 BLAKE2B 8f1409c8a381db4d12db126deca14c36be5a09eb580f280d6d50d3f60a7f5b51173bcfcba0ba7f4f618df7e3619b64ebeff5e990ddb477b57a7df6a37e25ca7a SHA512 d2ae101817a62f753d8f643540017ab9eb0e17d4c2905eff6a0481fdaecb643b84aa64ea4d0b7181b09637fab2a1a34e58b422128ca72a3db5c10419885eee7c
-DIST ngrok-bin-3.19.1-mips.tgz 12613213 BLAKE2B 14bece2fdc284379d3991ce425c9138fc885ce24734c86f41b4765ef239ad63fbe8a9cce380c72ecf3b421a29a4273e3c7b71a621b8c14be4dfcd701f5ba2477 SHA512 a66d6f3f1ea4f64bad1d3edec688858c3e2aad7e606d3819a1783d8b20bf6304be0b2cd7ad4a0057c36e08a5e0640488e314005ad0a405b42dadf00dc040478f
-DIST ngrok-bin-3.19.1-ppc64.tgz 13133107 BLAKE2B f1e37adb41d085962f918ddf44330749a3b51639a4654ca85af43ec7e00cad31287addd9e874c4eaecb48f19c5d924fdd82465ad670138e1fe23c48561c59363 SHA512 a784b4317a8657388f3d89b36159a8988a523c9928eb741fabe7c5a11af995cb13293f5245d77c95e547b076d52b73f7084b77e781789299c46bf23135c07d65
-DIST ngrok-bin-3.19.1-s390.tgz 14388183 BLAKE2B b35a10602ebf0be6d49a00385f18d54517b8b5a04eceee71b1b8a72e187ffc850c5c73e7412a3d823eb3bceea01411078f764ee9caa17c3df8829119b941e709 SHA512 b661665fe7209c59f439ed19ec9c527eb29661744bda599fc64679dffe3a2616ce97024f815566ed827f5a950a9e0e5d8b8d9a41478493c101f1942be2f4235f
-=======
 DIST ngrok-bin-3.20.0-amd64.tgz 14817368 BLAKE2B f5354f4e7b10f207aa2a6a21b8ada8d1d54d21b39e59369d482e7cf3af0b291d26d60333d3ae5e7e30b244e60824e1c7a635a1fb707ad85f0ae708e71f010ae5 SHA512 68de2f85f6673ef4318d082e99491315285dff4d792f5103a6f35ea1147cefb280a7a670d229a25c41a60e943cef6ea7c396f8d2700ea36b44bd7842feef33de
 DIST ngrok-bin-3.20.0-arm.tgz 14092164 BLAKE2B db37deed8c42e58a312593dfeedf4637ed08a0a3305bd13a58d8e27029a28587cb356d2c684e325455934d3816ec64d7fd353545aafcf3f76c363df3e4b6d0d4 SHA512 86d49b6c1e547be4da01feb6857881028a54cbbfc0314d59a1e8eba2327da4ece9d48e597596a583d53210719f0c6bffe3e4f2dd644e004148ebb48cd917813b
 DIST ngrok-bin-3.20.0-arm64.tgz 13490197 BLAKE2B 2ab5b1121686e14dc433ead89f41b63e06188c43e92e0fdafce671217ad46fa411880e7766d0d04a3f9ac2a731fb4e9062f38576f08e705bd7437b288d840bfc SHA512 131c651c9c904117ce1104d2d1b9ba517d945cc584298855f288c842018db1481e04e47a41d0c2080cd7340b53ab851ecc6f3652a5bf19c299470bfbbb54b651
@@ -14,4 +5,3 @@ DIST ngrok-bin-3.20.0-i386.tgz 13740996 BLAKE2B a9f4359d846f81c64cd480a1ae2678db
 DIST ngrok-bin-3.20.0-mips.tgz 12612361 BLAKE2B 8a2f6d29d73a78004034702863dbf348bffe7942ecb31871866c7f8b489e30e79595659780ec9072f96f2ca5c4a5623c79c25d0128e2fadc3e3603697531add6 SHA512 b1f312b83193d25b1fe396812664231d93316d8267e1e29743ecc128a8e4312930ff24b63b920038754f1380d6379b2b7d82663fea73fdcfb8cd34430bcdc184
 DIST ngrok-bin-3.20.0-ppc64.tgz 13132719 BLAKE2B e4d3f17f4a35f691b7a884c98df4656962419c2047b0477a460870f78d776283397fee0e15dad427e337a1d884439eebf2ca099610e3bf28788c824de03db074 SHA512 b35be9dc4a8474ecb71ab0bdfcb1dacbb60594fac58f1bbf4f8691045113c65b98d3f5e11b776deb32209f06ec4d7590e60060eeb37eaae1ad0c643c22e5d783
 DIST ngrok-bin-3.20.0-s390.tgz 14386871 BLAKE2B e48eb17bb210a7a2f723aeac305c02acb52656b6222f6dd818e22d40aa175a4194dac882fd46d618ff9f072875f0ca2b6836c5bc9126fc08e13d9ef079bae215 SHA512 c9ba714cc9bce37958939064f502240e8903f28c6cfa49a3e21ed0fd4b9b048afeec7ee8ef3099c02ab961e4db846d9199eeb212e2b820cca733ec5b1c95e296
->>>>>>> Stashed changes


             reply	other threads:[~2025-02-24 14:21 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-24 14:21 Aiden Wingard [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-02-24 14:17 [gentoo-commits] repo/proj/guru:dev commit in: net-proxy/ngrok-bin/ Aiden Wingard
2025-02-24 14:15 Aiden Wingard
2025-01-26 17:26 Nowa Ammerlaan
2024-12-20 19:11 Aiden Wingard
2024-12-20 19:06 Aiden Wingard
2024-11-17 13:16 Nowa Ammerlaan
2024-06-03  3:06 Aiden Wingard
2024-04-25 22:29 Aiden Wingard
2024-04-25 22:29 Aiden Wingard
2024-04-25 22:29 Aiden Wingard
2024-04-25 22:29 Aiden Wingard
2024-03-17 23:07 Aiden Wingard

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=1740406848.be1f61dca35d778261638a77ff10ffc97617f6d8.kernaltrap@gentoo \
    --to=kernaltrap@gmail.com \
    --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