Resolve merge conflicts #85
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* chainlink updates and remove old deployment * deploy relayer factories * update registry w deployment * Add addresses priceSource WSTETH and RETH * Add DeployArbUsdChainlinkRelayerMainnet * add arb oracle relayer --------- Co-authored-by: Patrick Gallagher <[email protected]>
pi0neerpat
requested changes
Jul 26, 2024
This error has been popping up in the tests since hai brought their bot online. Hunter and I had talked about it a couple days ago but were unable to come to a conclusion. You can run the tests again and it works sometimes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
this one should actually resolve the conflicts. ran into some git hub issues and the changes didn't actually get merged to the last branch.