conflicts

This commit is contained in:
Greg Lindsay
2020-02-11 13:10:57 -08:00
202 changed files with 1602 additions and 1092 deletions

View File

@ -55,4 +55,4 @@
##### [Activate clients running Windows 10](volume-activation/activate-windows-10-clients-vamt.md)
##### [Monitor activation [client]](volume-activation/monitor-activation-client.md)
##### [Use the Volume Activation Management Tool [client]](volume-activation/use-the-volume-activation-management-tool-client.md)
##### [Appendix: Information sent to Microsoft during activation [client]](volume-activation/appendix-information-sent-to-microsoft-during-activation-client.md)
##### [Appendix: Information sent to Microsoft during activation [client]](volume-activation/appendix-information-sent-to-microsoft-during-activation-client.md)