Polish

7 years ago · 1e62be6ac4
1 changed files with 0 additions and 1 deletions
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@ -1,6 +1,5 @@
				@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
-<<<<<<< HEAD
 		"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>