[gentoo-commits] repo/proj/guru:master commit in: www-client/zen-bin/

["David Roman" <davidroman96@gmail.com>]

commit:     11cdecd9c8e7fddc81b14b31e84ce34c23b007d2
Author:     Michal Vu <saigon-tech <AT> tuta <DOT> io>
AuthorDate: Wed Dec 11 11:36:09 2024 +0000
Commit:     David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Wed Dec 11 11:36:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=11cdecd9

www-client/zen-bin: Fixing bad Manifest and ebuild

Signed-off-by: Michal Vu <saigon-tech <AT> tuta.io>

 www-client/zen-bin/Manifest                     | 3 ---
 www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild | 4 ----
 2 files changed, 7 deletions(-)

diff --git a/www-client/zen-bin/Manifest b/www-client/zen-bin/Manifest
index dd7861651..67eb3bf06 100644
--- a/www-client/zen-bin/Manifest
+++ b/www-client/zen-bin/Manifest
@@ -1,6 +1,3 @@
 DIST zen-bin-1.0.1_alpha19.tar.bz2 89522253 BLAKE2B 333168463767dbf85be2c918c81892a4bafb47a5a9cb5b7301869aa44aeb762bdb3a16d06a3e411ff2cbb028297ada1a497513a74f643edd64324a25910923c9 SHA512 087b36c1d32656820e92a4c860fdc682a1b227f94ead7dc58ebbf8670b8345a9d383fcfbaacfb3c567d9685825f5f3af9381345b0e6753cdbedfafbd43f3dccc
 DIST zen-bin-1.0.1_alpha22.tar.bz2 89579148 BLAKE2B 23b8e88682b806f8937e9ffef082a3b5d90e285d0fa1ed60821fddfa22e464f65a24a43f4cb2edd96b8612e4e2fcf2104dabed194ee1a3d5f998feb35b9f365b SHA512 1e257cfbb1231c42b3e9f4b2867a54aafbbd5552b7316c1044ac452990d0d3bf36858d9cf684b5296b2b03ac4a9003931e8a716c026dadf614ff36027c41f353
-<<<<<<< HEAD
-=======
 DIST zen-bin-1.0.2_beta0.tar.bz2 94265180 BLAKE2B 3f52584c7eaf8b9653ea734a9d9b75aa82dd44b36b9c443ab0c3e4ee9b43f36102d8248962c02b424730196b8804f06c6c49c8b5672b5ee215a7419d0525e089 SHA512 5f2829a3fcf548d469d7bd6404232911a0520bb01e8b9a592a930c0fabad269c7cde297718e5f245a2b51268e0bcd443731498ae791600736868203530c7182d
->>>>>>> 07e9d37fd (www-client/zen-bin: add 1.0.1_alpha22)

diff --git a/www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild b/www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild
index 8337dd040..189160a80 100644
--- a/www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild
+++ b/www-client/zen-bin/zen-bin-1.0.1_alpha22.ebuild
@@ -5,11 +5,7 @@ EAPI=8
 
 inherit xdg-utils desktop
 
-<<<<<<< HEAD
-MY_PV="${PV/_alpha/-a.}"
-=======
 MY_PV="1.0.1-a.22"
->>>>>>> 07e9d37fd (www-client/zen-bin: add 1.0.1_alpha22)
 MY_P="zen"
 
 DESCRIPTION="Zen Browser - A Firefox-based browser focused on privacy"