diff options
author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java | |
parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java b/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java index dd5d9a42ed91..cbeefc786612 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java +++ b/platform/lang-impl/src/com/intellij/refactoring/inline/GenericInlineHandler.java @@ -184,7 +184,7 @@ public class GenericInlineHandler { } } else { - conflicts.putValue(referenceElement, "Cannot inline reference from " + language.getID()); + conflicts.putValue(referenceElement, "Cannot inline reference from " + language.getDisplayName()); } } |