fix: resolve merge conflicts in .gitignore

mitao

2025-03-19 0ab9dfd8f122195e4e9f09bd50c59e0a47450bec

1
2
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.taxi591.bankapi.BankConfig