Skip to content

S
spring-boot
Commit a4fd1416 authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Merge branch '2.1.x' 

Closes gh-17325
parents 361a9404 74912ee1
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
.gitignore
View file @ a4fd1416
...@@ -31,7 +31,6 @@ interpolated*.xml ...@@ -31,7 +31,6 @@ interpolated*.xml
lib/ lib/
manifest.yml manifest.yml
overridedb.* overridedb.*
settings.xml
target target
transaction-logs transaction-logs
.flattened-pom.xml .flattened-pom.xml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment