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

Farming contract #16

Merged
merged 41 commits into from
Nov 4, 2022
Merged

Farming contract #16

merged 41 commits into from
Nov 4, 2022

Conversation

PierreOssun
Copy link
Member

No description provided.

@HyunggyuJang
Copy link
Collaborator

Please rebase it on main with the fast forward strategy.

farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
…k/uniswap-dex-example into feature/farming-contract-add

� Conflicts:
�	farming/contracts/master_chef/Cargo.toml
�	farming/logics/traits/master_chef/farming.rs
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
farming/logics/traits/master_chef/farming.rs Outdated Show resolved Hide resolved
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