This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch 31
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
The following commit(s) were added to refs/heads/31 by this push:
new 15fa8a6 merge
15fa8a6 is described below
commit 15fa8a6488961fc85a795025d75c77fe6ca1852a
Author: Elliotte Rusty Harold <elh...@ibiblio.org>
AuthorDate: Sun Jan 24 09:15:03 2021 -0500
merge
---
pom.xml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 54b40b4..d5118b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,10 +68,7 @@ under the License.
<mavenVersion>3.0</mavenVersion>
<checkstyleVersion>8.29</checkstyleVersion>
<doxiaVersion>1.4</doxiaVersion>
-<<<<<<< HEAD
<sitePluginVersion>3.9.1</sitePluginVersion>
-=======
- <sitePluginVersion>3.9.0</sitePluginVersion>
<surefire.version>2.22.2</surefire.version>
<project.build.outputTimestamp>2021-01-23T22:30:12Z</project.build.outputTimestamp>
>>>>>>> master
