|
|
@@ -7,13 +7,8 @@ spring.mvc.view.suffix=.jsp
|
|
|
#logging.level.com.lemon.lifecenter.mapper=DEBUG
|
|
|
|
|
|
#product DEV properties
|
|
|
-<<<<<<< HEAD
|
|
|
spring.datasource.driver-class-name=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
|
|
spring.datasource.url=jdbc:log4jdbc:cubrid:localhost:30000:LIFE_CENTER:::?charset=UTF-8
|
|
|
-=======
|
|
|
-# spring.datasource.driver-class-name=net.sf.log4jdbc.sql.jdbcapi.DriverSpy
|
|
|
-# spring.datasource.url=jdbc:log4jdbc:cubrid:localhost:30000:LIFE_CENTER:::?charset=UTF-8
|
|
|
->>>>>>> b6fe8417b326ff5e6c932e61d33cae85d0ba072d
|
|
|
#logging.level.com.lemon.lifecenter.mapper=DEBUG
|
|
|
|
|
|
#product properties
|
