Skip to content

Commit 7f9d873

Browse files
committed
resolve merge conflicts
2 parents 0897ec9 + b34ca03 commit 7f9d873

File tree

250 files changed

+7881
-20834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+7881
-20834
lines changed

docfx.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
},
8686
"ms.subservice": {
8787
"api/Accessibility**.yml": "accessibility",
88-
"api/DbLinq.Util**.yml": "dbling.util",
8988
"api/Microsoft.Activities**.yml": "microsoft.activities",
9089
"api/Microsoft.Build**.yml": "microsoft.build",
9190
"api/Microsoft.CSharp**.yml": "microsoft.csharp",
@@ -95,15 +94,14 @@
9594
"api/Microsoft.VisualC**.yml": "microsoft.visualc",
9695
"api/Microsoft.Win32**.yml": "microsoft.win32",
9796
"api/Microsoft.Windows**.yml": "microsoft.windows",
98-
"api/Mono**.yml": "mono",
9997
"api/System.*.yml": "system",
10098
"api/System.Activities**.yml": "system.activities",
10199
"api/System.AddIn**.yml": "system.addin",
102100
"api/System.Buffers**.yml": "system.buffers",
103101
"api/System.CodeDom**.yml": "system.codedom",
104102
"api/System.Collections**.yml": "system.collections",
105-
"api/System.Composition**.yml": "system.composition",
106103
"api/System.ComponentModel**.yml": "system.componentmodel",
104+
"api/System.Composition**.yml": "system.composition",
107105
"api/System.Configuration**.yml": "system.configuration",
108106
"api/System.Data**.yml": "system.data",
109107
"api/System.Deployment**.yml": "system.deployment",

snippets/cpp/VS_Snippets_CLR/CodeArgumentReferenceExpressionExample/CPP/codeargumentreferenceexpressionexample.cpp

Lines changed: 0 additions & 43 deletions
This file was deleted.

snippets/cpp/VS_Snippets_CLR/CodeArrayCreateExpressionSnippet/CPP/codearraycreateexpressionsnippet.cpp

Lines changed: 0 additions & 289 deletions
This file was deleted.

0 commit comments

Comments
 (0)