garbage removed

2026-09-27 10:03:11 +07:00 · 2010-01-28 17:43:17 +03:00
parent 80b2c2f0f6
commit 0d1bf588da
1 changed files with 0 additions and 4 deletions
@@ -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