File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2020 <property name =" format" value =" >>>>>>> " />
2121 <property name =" message" value =" Found (>>>>>>> ), so it looks like you had a merge conflict that compiles. Please fix it." />
2222 </module >
23- <module name =" RegexpSingleline" >
24- <property name =" format" value =" \s+$" />
25- <property name =" message" value =" Whitespace at end-of-line" />
26- </module >
27- <module name =" RegexpMultiline" > <!-- Java Style Guide: Vertical Whitespace -->
28- <property name =" fileExtensions" value =" java" />
29- <property name =" format" value =" ^\n\n$" />
30- <property name =" message" value =" Two consecutive blank lines are not permitted." />
31- </module >
3223 <module name =" SuppressionFilter" > <!-- baseline-gradle: README.md -->
3324 <property name =" file" value =" ${config_loc}/checkstyle-suppressions.xml" />
3425 </module >
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ buildscript {
1515 classpath ' com.palantir.javaformat:gradle-palantir-java-format:2.89.0'
1616 classpath ' com.palantir.suppressible-error-prone:gradle-suppressible-error-prone:2.31.0'
1717 classpath ' org.revapi:gradle-revapi:1.8.0'
18- classpath ' com.palantir.baseline:gradle-baseline-java:7.3 .0'
18+ classpath ' com.palantir.baseline:gradle-baseline-java:7.4 .0'
1919 classpath ' com.palantir.gradle.consistentversions:gradle-consistent-versions:3.14.0'
2020 }
2121}
You can’t perform that action at this time.
0 commit comments