Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge conflicts #84

Merged
merged 3 commits into from
Jul 26, 2024
Merged

Merge conflicts #84

merged 3 commits into from
Jul 26, 2024

Conversation

MrDeadCe11
Copy link
Member

had to create a pr to resolve the merge conflicts with dev.

cupOJoseph and others added 2 commits April 24, 2024 17:36
* 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]>
@MrDeadCe11 MrDeadCe11 requested a review from pi0neerpat July 26, 2024 02:46
Copy link

codecov bot commented Jul 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 73.17%. Comparing base (0008f58) to head (7aa50ff).

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##              dev      #84   +/-   ##
=======================================
  Coverage   73.17%   73.17%           
=======================================
  Files          10       10           
  Lines         123      123           
=======================================
  Hits           90       90           
  Misses         33       33           

@pi0neerpat pi0neerpat merged commit 82f6db0 into dev Jul 26, 2024
5 checks passed
@pi0neerpat pi0neerpat deleted the merge-conflicts branch July 26, 2024 04:18
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