summaryrefslogtreecommitdiff
path: root/java/intellij-ultimate/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'java/intellij-ultimate/Makefile')
-rw-r--r--java/intellij-ultimate/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/intellij-ultimate/Makefile b/java/intellij-ultimate/Makefile
index 13430553d6fa..160fbdc2ab27 100644
--- a/java/intellij-ultimate/Makefile
+++ b/java/intellij-ultimate/Makefile
@@ -27,7 +27,7 @@ SHEBANG_FILES= bin/printenv.py bin/restart.py \
plugins/spy-js/server/proxy-nix.sh \
plugins/spy-js/server/proxy-osx.sh
-CONFLICTS= intellij-20*
+CONFLICTS= idea intellij
NO_ARCH= yes
NO_ARCH_IGNORE= libjansi.so