Skip to content

Conversation

PierreOssun
Copy link
Collaborator

No description provided.

@HyunggyuJang
Copy link
Collaborator

Please rebase it on main with the fast forward strategy.

…k/uniswap-dex-example into feature/farming-contract-add

� Conflicts:
�	farming/contracts/master_chef/Cargo.toml
�	farming/logics/traits/master_chef/farming.rs
Copy link
Collaborator

@HyunggyuJang HyunggyuJang left a comment

Choose a reason for hiding this comment

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

LGTM

@PierreOssun PierreOssun merged commit 23a126e into main Nov 4, 2022
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.

2 participants