Bastien Roucariès pushed to branch master at Debian Java Maintainers / netty
Commits: 44677155 by Bastien Roucariès at 2026-01-07T18:12:56+01:00 Fix a mismerge - - - - - 1 changed file: - debian/changelog Changes: ===================================== debian/changelog ===================================== @@ -44,13 +44,6 @@ netty (1:4.1.48-12) unstable; urgency=high -- Bastien Roucariès <[email protected]> Sun, 16 Nov 2025 09:30:49 +0100 -netty (1:4.1.48-12) unstable; urgency=medium - - * Split package for preparing upgrade - - -- Bastien Roucariès <[email protected]> Mon, 05 Jan 2026 12:46:47 +0100 ->>>>>>> 12730ffdcc (Split package) - netty (1:4.1.48-11) unstable; urgency=high * Team upload View it on GitLab: https://salsa.debian.org/java-team/netty/-/commit/4467715516e1a81020f133caed0409b40b713e88 -- View it on GitLab: https://salsa.debian.org/java-team/netty/-/commit/4467715516e1a81020f133caed0409b40b713e88 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
