Skip to content

Commit

Permalink
Merge pull request #103 from Team-Shaka/feat/98
Browse files Browse the repository at this point in the history
Conflict Resolve
  • Loading branch information
HyoBN authored Aug 9, 2024
2 parents 937b5fc + 9a38532 commit 8aea392
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ jwt:
authorities-key: authoritiesKey
access-token-validity-in-seconds: 180000 # 3 min
refresh-token-validity-in-seconds: 600000 # 5 min

firebase:
# admin-sdk: firebase/firebase-adminsdk-keyfile.json
admin-sdk: ${FCM_KEY}

cloud:
Expand Down Expand Up @@ -147,7 +147,6 @@ jwt:
refresh-token-validity-in-seconds: 3000000 # 14 d

firebase:
# admin-sdk: firebase/firebase-adminsdk-keyfile.json
admin-sdk: ${FCM_KEY}

cloud:
Expand Down

0 comments on commit 8aea392

Please sign in to comment.