Skip to content

Commit a4bae47

Browse files
MikeRayMSFTMikeRayMSFT
committed
fixing conflicts
2 parents dc416b3 + 81ede90 commit a4bae47

24,260 files changed

Lines changed: 98310 additions & 814465 deletions

File tree

Some content is hidden

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

‎.openpublishing.publish.config.json‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
],
1313
"monikers": [],
1414
"moniker_ranges": [
15-
"sql-server-2014",
16-
"azuresqldb-current || azuresqldb-mi-current || azure-sqldw-latest || >= aps-pdw-2016 || >= sql-server-2016 || >= sql-server-linux-2017 || sql-server-previousversions || sqlallproducts-allversions"
15+
"azuresqldb-current || azuresqldb-mi-current || azure-sqldw-latest || >= aps-pdw-2016 || >= sql-server-2016 || >= sql-server-linux-2017 || sqlallproducts-allversions"
1716
],
1817
"open_to_public_contributors": true,
1918
"type_mapping": {
@@ -67,10 +66,6 @@
6766
}
6867
],
6968
"branch_target_mapping": {
70-
"release-sqlseattle": [
71-
"Publish",
72-
"PDF"
73-
],
7469
"live": [
7570
"Publish",
7671
"PDF"

‎.openpublishing.redirection.json‎

Lines changed: 41403 additions & 8 deletions
Large diffs are not rendered by default.

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"git.ignoreLimitWarning": true
3+
}

‎docs/2014/2014-toc/case-study-building-an-enterprise-ecosystem.md‎

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

‎docs/2014/2014-toc/developer-reference-for-sql-server-2014.md‎

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

‎docs/2014/2014-toc/docs-sql-server-2014-from-msdn.md‎

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

0 commit comments

Comments
 (0)