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

[AUTO-MERGE] Merge main into develop via merge-main-to-develop #1195

Merged
merged 10 commits into from
Feb 2, 2022

Conversation

idanov
Copy link
Member

@idanov idanov commented Feb 1, 2022

A new change in main cannot be merged into develop as part of the regular sync job, hence this PR. Please resolve the conflicts manually, and make sure to obtain 2 approvals once the builds pass.

IMPORTANT NOTICE

Please let CircleCI merge this PR automatically, with merge commit enabled.

@idanov idanov requested a review from yetudada as a code owner February 1, 2022 15:45
Signed-off-by: Antony Milne <antony.milne@quantumblack.com>

# Conflicts:
#	features/windows_reqs.txt
#	setup.py
#	test_requirements.txt
@idanov idanov merged commit 49e1f06 into develop Feb 2, 2022
@idanov idanov deleted the merge-main-to-develop branch February 2, 2022 15:20
lorenabalan pushed a commit that referenced this pull request Feb 2, 2022
lorenabalan pushed a commit that referenced this pull request Feb 2, 2022
Galileo-Galilei pushed a commit to Galileo-Galilei/kedro that referenced this pull request Feb 19, 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.

8 participants