From 1e62be6ac4f98bfe80e3eea186d4f6b9d61067b5 Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Wed, 20 Mar 2019 14:37:30 +0000
Subject: [PATCH] Polish

---
 src/checkstyle/checkstyle-suppressions.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/checkstyle/checkstyle-suppressions.xml b/src/checkstyle/checkstyle-suppressions.xml
index 05560cea65c..858ed62c323 100644
--- a/src/checkstyle/checkstyle-suppressions.xml
+++ b/src/checkstyle/checkstyle-suppressions.xml
@@ -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>