Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Adding commands and icons for Resolve actions #105

Merged
merged 3 commits into from
Feb 15, 2017
Merged

Adding commands and icons for Resolve actions #105

merged 3 commits into from
Feb 15, 2017

Conversation

jpricket
Copy link
Member

Screenshot of icons:
image

@msftclas
Copy link

Hi @jpricketMSFT, I'm your friendly neighborhood Microsoft Pull Request Bot (You can call me MSBOT). Thanks for your contribution!


It looks like you're a Microsoft contributor. If you're full-time or an intern, we DON'T require a Contribution License Agreement. If you are a vendor, please DO sign the electronic Contribution License Agreement. It will take 2 minutes and there's no faxing! https://cla.microsoft.com.

TTYL, MSBOT;

jeffyoung
jeffyoung approved these changes Feb 15, 2017
View reviewed changes
Copy link
Contributor

@jeffyoung jeffyoung left a comment

Choose a reason for hiding this comment

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

Just a single spelling mistake. LGTM.

package.json Outdated
@@ -276,6 +296,24 @@
}
},
{
"command": "tfvc.ResolveKeepYours",
"title": "Resove: Keep Yours",
Copy link
Contributor

Choose a reason for hiding this comment

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

Resove ==> Resolve

@jpricket jpricket merged commit 8398d97 into master Feb 15, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jeffyoung jeffyoung jeffyoung approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jpricket @msftclas @jeffyoung