Skip to content
This repository has been archived by the owner on Aug 21, 2024. It is now read-only.

fix: merge conflict #1974

Merged
merged 1 commit into from
Jun 10, 2024
Merged

fix: merge conflict #1974

merged 1 commit into from
Jun 10, 2024

Conversation

AvivYossef-starkware
Copy link
Collaborator

@AvivYossef-starkware AvivYossef-starkware commented Jun 9, 2024

This change is Reviewable

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.44%. Comparing base (605b4bd) to head (da553cb).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1974   +/-   ##
=======================================
  Coverage   78.43%   78.44%           
=======================================
  Files          62       62           
  Lines        8843     8847    +4     
  Branches     8843     8847    +4     
=======================================
+ Hits         6936     6940    +4     
  Misses       1470     1470           
  Partials      437      437           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@Yoni-Starkware Yoni-Starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dorimedini-starkware)

@Yoni-Starkware Yoni-Starkware merged commit ba7927a into main Jun 10, 2024
15 checks passed
@Yoni-Starkware Yoni-Starkware deleted the aviv/fix_tx_execution branch June 10, 2024 03:51
gswirski pushed a commit to reilabs/blockifier that referenced this pull request Jun 26, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants