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

Conflicts not properly resolved #7

Open

xujiahuayz opened this issue Sep 17, 2022 · 0 comments

Assignees

Owner

xujiahuayz commented Sep 17, 2022

Code conflicts that arose when merging main to your own branch were not resolved properly:

yieldAggregators/yieldenv/utils.py

Line 73 in 233054f

<<<<<<< HEAD

xujiahuayz assigned honglinfu1998

honglinfu1998 added a commit that referenced this issue


          https://github.com/xujiahuayz/yieldAggregators/issues/7

145ae35

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment