8000 Fix post-merge issues · dotnet/wpf@00c98c2 · GitHub
[go: up one dir, main page]

Skip to content

Commit 00c98c2

Browse files
committed
Fix post-merge issues
1 parent 8ef9fcf commit 00c98c2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/Microsoft.DotNet.Wpf/src/PresentationCore/System/Windows/TextDecorationCollectionConverter.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
3-
// See the LICENSE file in the project root for more information.
43

4+
using System.ComponentModel.Design.Serialization;
55
using System.ComponentModel;
66
using System.Globalization;
77
using System.Reflection;
88

99
namespace System.Windows
1010
{
1111
/// <summary>
12-
/// Provides a type converter to convert from <see langword="string"/> to <see cref="TextDecorationCollection"/> only.
12+
/// Provides a type converter to convert from <see cref="string"/> to <see cref="TextDecorationCollection"/> only.
1313
/// </summary>
1414
public sealed class TextDecorationCollectionConverter : TypeConverter
1515
{
@@ -44,7 +44,7 AC92 @@ public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceT
4444
}
4545

4646
/// <summary>
47-
/// Converts <paramref name="input"/> of <see langword="string"/> type to its <see cref="TextDecorationCollection"/> represensation.
47+
/// Converts <paramref name="input"/> of <see langword="string"/> type to its <see cref="TextDecorationCollection"/> representation.
4848
/// </summary>
4949
/// <param name="context">Context information used for conversion, ignored currently.</param>
5050
/// <param name="culture">The culture specifier to use, ignored currently.</param>
@@ -62,10 +62,10 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
6262
}
6363

6464
/// <summary>
65-
/// Converts <paramref name="text"/> to its <see cref="TextDecorationCollection"/> represensation.
65+
/// Converts <paramref name="text"/> to its <see cref="TextDecorationCollection"/> representation.
6666
/// </summary>
6767
/// <param name="text">The string to be converted into TextDecorationCollection object.</param>
68-
/// <returns>A <see cref="TextDecorationCollection"/> representing the <see langword="string"/> specified by <paramref name="text"/>.</returns>
68+
/// <returns>A <see cref="TextDecorationCollection"/> representing the <see cref="string"/> specified by <paramref name="text"/>.</returns>
6969
/// <remarks>
7070
/// The text parameter can be either be <see langword="null"/>; <see cref="string.Empty"/>; the string "None"
7171
/// or a combination of the predefined <see cref="TextDecorations"/> names delimited by commas (,).

0 commit comments

Comments
 (0)
0