[PATCH v2 3/3] wldp: Add WldpQueryWindowsLockdownMode stub.

[Helix Graziani]

From: Helix Graziani

---
 include/wldp.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/include/wldp.h b/include/wldp.h
index 467e2ad8fe5..fba335aed37 100644
--- a/include/wldp.h
+++ b/include/wldp.h
@@ -39,10 +39,14 @@ typedef enum _WLDP_WINDOWS_LOCKDOWN_MODE
   WLDP_WINDOWS_LOCKDOWN_MODE_LOCKED,
   WLDP_WINDOWS_LOCKDOWN_MODE_MAX
 <<<<<<< HEAD
+<<<<<<< HEAD
 } WLDP_WINDOWS_LOCKDOWN_MODE, *PWLDP_WINDOWS_LOCKDOWN_MODE;
 =======
 } WLDP_WINDOWS_LOCKDOWN_MODE;
> > > > > > > ff16e11db93 (wldp: Add WldpQueryWindowsLockdownMode stub.)

+=======
+} WLDP_WINDOWS_LOCKDOWN_MODE, *PWLDP_WINDOWS_LOCKDOWN_MODE;
+>>>>>>> 1d6a6ebb16a (wldp: Add WldpQueryWindowsLockdownMode stub.)

typedef struct WLDP_HOST_INFORMATION
 {