From 7991c34fc087e696ddacd1e425d1b1227ba0532e Mon Sep 17 00:00:00 2001
From: "a.croix" <croix.alexandre@gmail.com>
Date: Wed, 27 Mar 2019 12:34:48 +0100
Subject: [PATCH] Fix merge conflicts
---
checkstyle.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/checkstyle.xml b/checkstyle.xml
index 77b8d98..9337a1f 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -205,7 +205,10 @@
<module name="FinalClass"/>
<module name="HideUtilityClassConstructor"/>
<module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/>
+ <module name="VisibilityModifier">
+ <property name="protectedAllowed" value="true"/>
+ </module>
+
<!-- Miscellaneous other checks. -->
--
GitLab