Skip to content

Commit b648968

Browse files
committed
Fix merge conflicts from rebase
1 parent 3455766 commit b648968

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

repo-scripts/doc-plugin-rush-stack/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
"build": "gulp test --clean"
1111
},
1212
"dependencies": {
13-
"@microsoft/api-documenter": "7.3.16",
13+
"@microsoft/api-documenter": "7.3.17",
1414
"@microsoft/api-extractor-model": "7.3.2",
1515
"@microsoft/node-core-library": "3.14.0",
1616
"@microsoft/tsdoc": "0.12.12",
1717
"js-yaml": "~3.13.1"
1818
},
1919
"devDependencies": {
20-
"@microsoft/rush-stack-compiler-3.4": "0.1.17",
21-
"@microsoft/node-library-build": "6.1.4",
20+
"@microsoft/rush-stack-compiler-3.4": "0.1.18",
21+
"@microsoft/node-library-build": "6.1.5",
2222
"@types/js-yaml": "3.12.1",
2323
"@types/node": "8.5.8",
2424
"gulp": "~4.0.2"

repo-scripts/generate-api-docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
},
1010
"dependencies": {
1111
"doc-plugin-rush-stack": "1.0.0",
12-
"@microsoft/api-documenter": "7.3.16"
12+
"@microsoft/api-documenter": "7.3.17"
1313
}
1414
}

0 commit comments

Comments
 (0)