Skip to content

Commit 7ca1ac5

Browse files
committed
fix merge conflict resolution
1 parent 7f9d873 commit 7ca1ac5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

xml/System/AttributeTargets.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,13 @@
7878
> Visual Basic syntax doesn't support the application of attributes to type parameters.
7979
8080
:::code language="csharp" source="~/snippets/csharp/System/AttributeTargets/Overview/attrtargs.cs" id="Snippet1":::
81+
:::code language="fsharp" source="~/snippets/fsharp/VS_Snippets_CLR/AttrTargs/FS/attrtargs.fs" id="Snippet1":::
8182
:::code language="vb" source="~/snippets/visualbasic/VS_Snippets_CLR/AttrTargs/VB/AttrTargs.vb" id="Snippet1":::
82-
83+
]]></format>
84+
</remarks>
85+
<altmember cref="T:System.AttributeUsageAttribute" />
86+
</Docs>
87+
<Members>
8388
<Member MemberName="All">
8489
<MemberSignature Language="C#" Value="All" />
8590
<MemberSignature Language="ILAsm" Value=".field public static literal valuetype System.AttributeTargets All = int32(32767)" FrameworkAlternate="dotnet-uwp-10.0;net-10.0;net-5.0;net-6.0;net-7.0;net-8.0;net-9.0;netcore-1.0;netcore-1.1;netcore-2.0;netcore-2.1;netcore-2.2;netcore-3.0;netcore-3.1;netframework-2.0;netframework-3.0;netframework-3.5;netframework-4.0;netframework-4.5;netframework-4.5.1;netframework-4.5.2;netframework-4.6;netframework-4.6.1;netframework-4.6.2;netframework-4.6.2-pp;netframework-4.7;netframework-4.7.1;netframework-4.7.2;netframework-4.8;netframework-4.8.1;netstandard-1.0;netstandard-1.1;netstandard-1.2;netstandard-1.3;netstandard-1.4;netstandard-1.5;netstandard-1.6;netstandard-2.0;netstandard-2.1" />

0 commit comments

Comments
 (0)