Merge branch '2.1.x'

Closes gh-17325
5 years ago · a4fd141622
parent 361a9404fd 74912ee126
commit a4fd141622
1 changed files with 0 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -31,7 +31,6 @@ interpolated*.xml
 lib/
 manifest.yml
 overridedb.*
-settings.xml
 target
 transaction-logs
 .flattened-pom.xml