Skip to content

Fix bad merge in descriptions.json #47359

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

Merged
danmoseley merged 1 commit into from
Jan 23, 2021
Merged

Fix bad merge in descriptions.json #47359

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/libraries/pkg/descriptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2072,22 +2072,22 @@
},
{
"Name": "System.ServiceProcess.ServiceController",
"Description": "Provides types to perform speech synthesis and speech recognition.",
"Description": "Provides the System.ServiceProcess.ServiceContainer class, which allows you to connect to a running or stopped service, manipulate it, or get information about it.",
"CommonTypes": [
"System.Speech.Synthesis.SpeechSynthesizer",
"System.Speech.Recognition.SpeechRecognizer"
"System.ServiceProcess.ServiceController",
"System.ServiceProcess.ServiceControllerStatus",
"System.ServiceProcess.ServiceType"
]
},
{
"Name": "System.Speech",
"Description": "Provides the System.ServiceProcess.ServiceContainer class, which allows you to connect to a running or stopped service, manipulate it, or get information about it.",
"Description": "Provides types to perform speech synthesis and speech recognition.",
"CommonTypes": [
"System.ServiceProcess.ServiceController",
"System.ServiceProcess.ServiceControllerStatus",
"System.ServiceProcess.ServiceType"
"System.Speech.Synthesis.SpeechSynthesizer",
"System.Speech.Recognition.SpeechRecognizer"
]
},
{
{
"Name": "System.Text.Encoding",
"Description": "Provides base abstract encoding classes for converting blocks of characters to and from blocks of bytes.",
"CommonTypes": [
Expand Down