diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /3rdparty/genie/src/_manifest.lua | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to '3rdparty/genie/src/_manifest.lua')
-rw-r--r-- | 3rdparty/genie/src/_manifest.lua | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/3rdparty/genie/src/_manifest.lua b/3rdparty/genie/src/_manifest.lua index d2be5f1dcb5..d44e7565bf1 100644 --- a/3rdparty/genie/src/_manifest.lua +++ b/3rdparty/genie/src/_manifest.lua @@ -64,7 +64,6 @@ "actions/vstudio/vs2013.lua", "actions/vstudio/vs2015.lua", "actions/vstudio/vs2017.lua", - "actions/vstudio/vsllvm.lua", -- Xcode action "actions/xcode/_xcode.lua", |