Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Fix Sagar and I crossing wires #1810

Merged
merged 1 commit into from
Nov 13, 2018
Merged

Conversation

carllin
Copy link
Contributor

@carllin carllin commented Nov 13, 2018

Problem

Function signature mismatch from Sagar's commit conflicting with my earlier change

Summary of Changes

Update test to resolve conflicts

Fixes #

@carllin carllin requested a review from sagar-solana November 13, 2018 22:55
Copy link
Contributor

@sagar-solana sagar-solana left a comment

Choose a reason for hiding this comment

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

Ah damn my CI run was too old.

@carllin carllin merged commit 4668a79 into solana-labs:master Nov 13, 2018
vkomenda pushed a commit to vkomenda/solana that referenced this pull request Aug 29, 2021
Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.2.4 to 4.3.2.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](microsoft/TypeScript@v4.2.4...v4.3.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
behzadnouri pushed a commit to behzadnouri/solana that referenced this pull request Jun 24, 2024
…1810)

* cli: Add `ComputeUnitConfig` and use it, no functional changes

* Use Option<u64> directly instead of ref

* Correct default compute unit limit comment
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.

2 participants