resolve the conflict

This commit is contained in:
huaping yu
2019-06-19 11:05:10 -07:00
57 changed files with 15390 additions and 15493 deletions

View File

@ -35,4 +35,4 @@
### [Run Surface Diagnostic Toolkit for Business using commands](surface-diagnostic-toolkit-command-line.md)
## [Surface Data Eraser](microsoft-surface-data-eraser.md)
## [Top support solutions for Surface devices](support-solutions-surface.md)
## [Change history for Surface documentation](change-history-for-surface.md)
## [Change history for Surface documentation](change-history-for-surface.md)