From 800e6398940a7e3dc9e88e2b59a1813c3b29645d Mon Sep 17 00:00:00 2001 From: Gerardo Saca Date: Fri, 11 Aug 2017 15:50:18 -0700 Subject: [PATCH] Remove git metadata from vda-subscription-activation --- windows/deployment/vda-subscription-activation.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/windows/deployment/vda-subscription-activation.md b/windows/deployment/vda-subscription-activation.md index 4954192798..8d3a787f3c 100644 --- a/windows/deployment/vda-subscription-activation.md +++ b/windows/deployment/vda-subscription-activation.md @@ -12,11 +12,7 @@ author: greg-lindsay # Configure VDA for Windows 10 Subscription Activation -<<<<<<< HEAD -This document describes how to configure virtual machines (VMs) to enable [Windows 10 Subscription Activation](windows-10-enterprise-subscription-activation.md) in a Windows Virtual Desktop Access (VDA) scenario. Windows VDA is a device or user-based license. -======= This document describes how to configure virtual machines (VMs) to enable [Windows 10 Subscription Activation](windows-10-enterprise-subscription-activation.md) in a Windows Virtual Desktop Access (VDA) scenario. Windows VDA is a device or user-based licensing mechanism for managing access to virtual desktops. ->>>>>>> 9cfade7b4735548209a42a177179689a7e522ec6 ## Requirements