search

stacks-network / stacks-core

The Stacks blockchain implementation
https://docs.stacks.co
GNU General Public License v3.0
3.01k stars 667 forks source link

fixing conflicts between master and release/2.5.0.0.4 #4916

Closed wileyj closed 3 months ago

wileyj commented 3 months ago

Fixing conflicts related to #4915 Some CI changes were present in master but not in release branch relating to how often CI is triggered and what triggers it.

wileyj commented 3 months ago

hmm, this isn't going to work - would require updating master with changes from 2.5.0.04