avoid duplications inside conflict message (IDEA-153450)

This commit is contained in:
Anna.Kozlova
2016-03-22 19:22:42 +01:00
parent 0d78fb9f8d
commit 04a4de4483
@@ -687,7 +687,7 @@ method.0.will.implement.method.of.the.base.class=Method {0} will implement \na m
method.0.will.override.a.method.of.the.base.class=Method {0} will override \na method of the base class {1}
current.class=current class
field.0.is.already.defined.in.the.1=Field {0} is already defined in the {1}
field.0.will.hide.field.1.of.the.base.class=Field {0} will hide \na field {1} of the base class {2}
field.0.will.hide.field.1.of.the.base.class=Field {0} will hide \na field {1} of the base {2}
directory.0.already.contains.1.named.2=Directory {0} \nalready contains {1} named ''{2}''
directory.0.already.contains.a.file.named.1=Directory {0} \nalready contains a file named ''{1}''
getter.and.setter.methods.found.for.the.field.0=Getter and setter methods found for the field {0}. \n{1} them as well?