From 77c26766456bf37db39279dc126a6b341fe6ead9 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Mon, 4 Feb 2013 12:11:13 +0400 Subject: [PATCH] IDEA-100180 Gradle: "Show conflict" action does nothing for libraries --- .../gradle/sync/conflict/GradleConflictControlFactory.java | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java index 56d18616c509..d3d87f7db9bc 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleConflictControlFactory.java @@ -67,6 +67,7 @@ public class GradleConflictControlFactory { @Override public void visit(@NotNull LibraryOrderEntry libraryDependency) { + result.set(myCommonDependencyFactory.getControl(libraryDependency, changes)); } @Override