From b380514764cf857469bae61c11143a19f79a74c5 Mon Sep 17 00:00:00 2001 From: andreasnaive Date: Mon, 25 Mar 2019 23:13:40 +0100 Subject: Revert "conflict resolution (nw)" This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing changes made to 009cba4fb8102102168ef32870892438327f3705. --- scripts/src/osd/windows.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts/src/osd/windows.lua') diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index ecb3030c683..00432b75a8e 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -44,7 +44,6 @@ function maintargetosdoptions(_target,_subtarget) "comdlg32", "psapi", "ole32", - "shlwapi", } end -- cgit v1.2.3-70-g09d2