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.

Sign up for GitHub

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

Jump to bottom

fix bb conflicts #1648

Merged
merged 3 commits into from
Aug 18, 2023
Merged

fix bb conflicts #1648

merged 3 commits into from
Aug 18, 2023

Conversation

jeanmon
Copy link
Contributor

@jeanmon jeanmon commented Aug 18, 2023 •
edited
Loading

Re-sync BB upstream repo.

Checklist:

Remove the checklist to signal you've completed it. Enable auto-merge if the PR is ready to merge.

  • If the pull request requires a cryptography review (e.g. cryptographic algorithm implementations) I have added the 'crypto' tag.
  • I have reviewed my diff in github, line by line and removed unexpected formatting changes, testing logs, or commented-out code.
  • Every change is related to the PR description.
  • I have linked this pull request to relevant issues (if any exist).

@jeanmon jeanmon marked this pull request as ready for review August 18, 2023 14:36
@jeanmon jeanmon requested a review from dbanks12 August 18, 2023 14:36
jeanmon added 3 commits August 18, 2023 15:02
@jeanmon
git subrepo pull (merge) circuits/cpp/barretenberg
395d05a 
subrepo:
  subdir:   "circuits/cpp/barretenberg"
  merged:   "1b2112aec"
upstream:
  origin:   "https://github.com/AztecProtocol/barretenberg"
  branch:   "master"
  commit:   "c734295a1"
git-subrepo:
  version:  "0.4.6"
  origin:   "???"
  commit:   "???"
@jeanmon
Resync BB subrepo
045835e
@jeanmon
Update yarn.lock
77dc2f1
@jeanmon jeanmon force-pushed the jm/fix-bb-conflicts branch from 470b0ef to 77dc2f1 Compare August 18, 2023 15:02
@ludamad ludamad enabled auto-merge (squash) August 18, 2023 15:14
@ludamad ludamad merged commit 88cd267 into master Aug 18, 2023
@ludamad ludamad deleted the jm/fix-bb-conflicts branch August 18, 2023 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dbanks12 dbanks12 dbanks12 approved these changes

@ludamad ludamad ludamad approved these changes

Assignees
No one assigned
Labels
None yet
Projects
A3
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jeanmon @ludamad @dbanks12