Skip to content

Conversation

@meziantou
Copy link
Contributor

No description provided.

@yaira2 yaira2 requested a review from d2dyno1 November 28, 2021 03:56
@yaira2 yaira2 added the ready for review Pull requests that are ready for review label Nov 28, 2021
d2dyno1
d2dyno1 previously approved these changes Nov 28, 2021
@gave92
Copy link
Member

gave92 commented Nov 28, 2021

Please merge #7078 before this one, it makes most of the edits here unneeded.

@yaira2
Copy link
Member

yaira2 commented Nov 28, 2021

@meziantou can you resolve the merge conflicts?

@meziantou
Copy link
Contributor Author

I've rebased the branch. There is not much too do with the recent changes. It should be easier to review :)

Copy link
Member

@gave92 gave92 left a comment

Choose a reason for hiding this comment

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

Thanks a lot @meziantou

@yaira2 yaira2 added ready to merge Pull requests that are approved and ready to merge and removed ready for review Pull requests that are ready for review labels Nov 28, 2021
@yaira2 yaira2 merged commit a6680c7 into files-community:main Nov 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready to merge Pull requests that are approved and ready to merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants