@@ -6,7 +6,6 @@ spring:
username: dil
driver-class-name: oracle.jdbc.OracleDriver
application:
-<<<<<<< HEAD
name: dil-ams-api-dev
openfeign:
Your Name