Skip to content

Remove git conflict markers#216

Merged
colin-home merged 2 commits into
MicrosoftDocs:masterfrom
ssbl:rm-conflict-markers
Apr 30, 2018
Merged

Remove git conflict markers#216
colin-home merged 2 commits into
MicrosoftDocs:masterfrom
ssbl:rm-conflict-markers

Conversation

@ssbl

@ssbl ssbl commented Apr 29, 2018

Copy link
Copy Markdown
Contributor

This PR cleans up git's conflict markers from the Functions section.

@PRMerger19

Copy link
Copy Markdown
Contributor

@ssbl : Thanks for your contribution! The author, @mikeblome, has been notified to review your proposed change.

@msftclas

msftclas commented Apr 30, 2018

Copy link
Copy Markdown

CLA assistant check
All CLA requirements met.

@colin-home colin-home left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Approved. Thanks!

@PRMerger12

Copy link
Copy Markdown
Contributor

@ssbl : Thanks for your contribution! The author, @mikeblome, has been notified to review your proposed change.

@colin-home

Copy link
Copy Markdown
Contributor

Does a #sign-off work here?

@PRMerger8

Copy link
Copy Markdown
Contributor

@corob-msft: I'm sorry - only the author of this article, @mikeblome, can sign off on your changes. But we do have an exception process - if you are on the Microsoft content or product team for this product area, you can ask the PR review team to review and merge it by sending mail to the techdocprs alias.

@colin-home colin-home merged commit 23eb4ed into MicrosoftDocs:master Apr 30, 2018
@ssbl ssbl deleted the rm-conflict-markers branch April 30, 2018 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants