Skip to content

Conversation

@wojcik91
Copy link
Contributor

Resolve conflicts, update protos & dependencies

t-aleksander and others added 5 commits August 6, 2025 09:55
* restore merging of ips

* merge adjacent subnets for nft (#185)

* merge adjacent elements

* update new tests

* linter fixes

* linter fix

* review fixes

---------

Co-authored-by: Maciek <[email protected]>
Co-authored-by: Maciej Wójcik <[email protected]>
Co-authored-by: Maciej Wójcik <[email protected]>
@wojcik91 wojcik91 self-assigned this Sep 10, 2025
@wojcik91 wojcik91 merged commit 5d3549f into release/1.5-alpha Sep 10, 2025
2 checks passed
@wojcik91 wojcik91 deleted the pre_release_1.5_cleanup branch September 10, 2025 08:41
@wojcik91 wojcik91 restored the pre_release_1.5_cleanup branch September 10, 2025 09:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants