diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /scripts/src/osd/windows.lua | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'scripts/src/osd/windows.lua')
-rw-r--r-- | scripts/src/osd/windows.lua | 1 |
1 files changed, 0 insertions, 1 deletions
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 |