Your Name 4 năm trước cách đây
mục cha
commit
1243fe40a3

+ 0 - 1
src/main/resources/application-prod.yml

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