Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Remove the old S.M.A.csproj that was revived when resolving conflict#3408

Merged
daxian-dbw merged 1 commit into
PowerShell:masterPowerShell/PowerShell:masterfrom
daxian-dbw:DeleteRevivedFilesdaxian-dbw/PowerShell:DeleteRevivedFilesCopy head branch name to clipboard
Mar 23, 2017
Merged

Remove the old S.M.A.csproj that was revived when resolving conflict#3408
daxian-dbw merged 1 commit into
PowerShell:masterPowerShell/PowerShell:masterfrom
daxian-dbw:DeleteRevivedFilesdaxian-dbw/PowerShell:DeleteRevivedFilesCopy head branch name to clipboard

Conversation

@daxian-dbw

Copy link
Copy Markdown
Member

The file src/vs-csproj/System.Management.Automation.csproj was revived when I was resolving conflicts for PR #3398. Remove it with this change

@daxian-dbw daxian-dbw requested review from lzybkr and removed request for lzybkr March 23, 2017 21:49
@daxian-dbw

Copy link
Copy Markdown
Member Author

Thanks @vors !

@daxian-dbw daxian-dbw merged commit d6b2d8f into PowerShell:master Mar 23, 2017
@daxian-dbw daxian-dbw deleted the DeleteRevivedFiles branch March 23, 2017 22:16
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.

3 participants

Morty Proxy This is a proxified and sanitized view of the page, visit original site.