From 0d1bf588da62428e7fc414c91590bacc25cf2f71 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Wed, 27 Jan 2010 14:52:51 +0300
Subject: [PATCH] garbage removed

---
 resources-en/src/messages/JavaErrorMessages.properties | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/resources-en/src/messages/JavaErrorMessages.properties b/resources-en/src/messages/JavaErrorMessages.properties
index 0d72c9964c..1c905d8329 100644
--- a/resources-en/src/messages/JavaErrorMessages.properties
+++ b/resources-en/src/messages/JavaErrorMessages.properties
@@ -334,7 +334,3 @@ illegal.initializer=Illegal initializer for ''{0}''
 class.cannot.inherit.from.its.type.parameter=Class cannot inherit from its type parameter
 cannot.resolve.package=Cannot resolve package {0}
 override.not.allowed.in.interfaces=@Override is not allowed when implementing interface method
-<<<<<<< HEAD
-
-=======
->>>>>>> idea90
-- 
2.11.4.GIT