actions/lint
1
0
Fork 0
mirror of https://github.com/super-linter/super-linter.git synced 2024-11-25 07:31:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix merge conflict, whoops

Browse source
This commit is contained in:
Casey Vega 2020-07-06 11:14:55 -07:00
parent 7680d58cd5
commit 05e73c6127
No known key found for this signature in database
GPG key ID: 2E831CEB696E297C
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/validation.sh
View file

@ -105,12 +105,9 @@ function GetValidationInfo() {
$VALIDATE_PROTOBUF || -n \
$VALIDATE_OPENAPI || -n \
$VALIDATE_KOTLIN || -n \
<<<<<<< HEAD
$VALIDATE_DART ]]; then
=======
$VALIDATE_DART || -n \
$VALIDATE_EDITORCONFIG || -n \
$VALIDATE_HTML ]]; then
>>>>>>> master
ANY_SET="true"
fi