commit a991c6748737952fd561afe81fece57397da07a7
author Alexey Ushakov <alexey.ushakov@jetbrains.com> Thu Nov 22 18:50:22 2018 +0300
committer Alexey Ushakov <alexey.ushakov@jetbrains.com> Thu Nov 22 18:50:22 2018 +0300
tree 4ed2ad67bea12cde931858b68339c0e677eea9b6
parent ec5b79bdab8f189f23e773b115bb384731b12df7

JRE-1032 Evaluate reported OpenJDK vulnerabilities in IntelliJ IDEA Community

Fixed merge issue

make/windows/makefiles/compile.make

diff --git a/make/windows/makefiles/compile.make b/make/windows/makefiles/compile.make
index 82bb71f..c867a1a 100644
--- a/make/windows/makefiles/compile.make
+++ b/make/windows/makefiles/compile.make
@@ -152,7 +152,6 @@
 !if "$(MSC_VER)" == "1913"
 COMPILER_NAME=VS2017
 !endif
-!endif
 
 # By default, we do not want to use the debug version of the msvcrt.dll file
 #   but if MFC_DEBUG is defined in the environment it will be used.