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.

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

Added Mean_filter_2D #153

Closed
wants to merge 12 commits into from
Closed

Added Mean_filter_2D #153

wants to merge 12 commits into from

Conversation

Mainak431
Copy link
Contributor

No description provided.

@facaiy facaiy added this to In progress in PR Queue via automation Apr 10, 2019
@facaiy facaiy requested a review from seanpmorgan April 10, 2019 03:13
@Mainak431 Mainak431 requested a review from a team as a code owner April 10, 2019 09:51
PR Queue automation moved this from In progress to Review in progress Apr 10, 2019
armando-fandango
armando-fandango suggested changes Apr 10, 2019
View reviewed changes
Copy link
Contributor

@armando-fandango armando-fandango left a comment

Choose a reason for hiding this comment

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

Please resolve conflict in README.md

@Mainak431
Copy link
Contributor Author

<<<<<<< patch-7
| mean_filter_2d | @Mainak431 | mainakdutta76@gmail.com |

master
| median_filter_2d | @Mainak431 | mainakdutta76@gmail.com |

This is showing as conflict. I dont understand why. I have included both the submodules mean_filter_2d and median_filter_2d. I have not replaced the second with the first. If anybody understand how to resolve this conflict, please help.

@facaiy
Copy link
Member

facaiy commented Apr 11, 2019

Mainak, I think this is a conflict between your PR branch and the latest master branch. You need to fetch the latest master branch, and resolve the merge conflict.

@Mainak431
Copy link
Contributor Author

Done

@seanpmorgan
Copy link
Member

@Mainak431 there should be several merge conflicts after #184 . Could you please restructure when time allows. Thanks.

@Mainak431
Copy link
Contributor Author

Closing this PR. Opened restructured one at #185

@Mainak431 Mainak431 closed this Apr 17, 2019
PR Queue automation moved this from Review in progress to Done Apr 17, 2019
@tetsuyasu tetsuyasu mentioned this pull request Aug 26, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@armando-fandango armando-fandango armando-fandango requested changes

@seanpmorgan seanpmorgan Awaiting requested review from seanpmorgan

Assignees
No one assigned
Labels
cla: yes image
Projects
No open projects
PR Queue
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Mainak431 @facaiy @seanpmorgan @armando-fandango @googlebot @kokoro-team