Skip to content

Commit 2017581

Browse files
committed
FIX: conflict
1 parent de0a384 commit 2017581

File tree

2 files changed

+1
-36
lines changed

2 files changed

+1
-36
lines changed

src/main/java/jshop/global/command/AdminInit.java

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ spring:
33
name: jshop
44
datasource:
55
hikari:
6-
idle-timeout: 250
6+
maximum-pool-size: 20
77
jpa:
88
hibernate:
99
ddl-auto: update

0 commit comments

Comments
 (0)