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

[Helix Graziani]

From: Helix Graziani <helix.graziani(a)hotmail.com>

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

diff --git a/include/wldp.h b/include/wldp.h
index 93f246fffa4..467e2ad8fe5 100644
--- a/include/wldp.h
+++ b/include/wldp.h
@@ -38,7 +38,11 @@ typedef enum _WLDP_WINDOWS_LOCKDOWN_MODE
   WLDP_WINDOWS_LOCKDOWN_MODE_TRIAL,
   WLDP_WINDOWS_LOCKDOWN_MODE_LOCKED,
   WLDP_WINDOWS_LOCKDOWN_MODE_MAX
+<<<<<<< HEAD
 } WLDP_WINDOWS_LOCKDOWN_MODE, *PWLDP_WINDOWS_LOCKDOWN_MODE;
+=======
+} WLDP_WINDOWS_LOCKDOWN_MODE;
+>>>>>>> ff16e11db93 (wldp: Add WldpQueryWindowsLockdownMode stub.)
 
 typedef struct WLDP_HOST_INFORMATION
 {
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/3784