Merge branch 'main' into develop · depromeet/fairer-be@296d495 · GitHub

Commit

Merge branch 'main' into develop

Browse files

# Conflicts:
#	fairer-batch/src/main/java/com/depromeet/fairer/config/DoHouseworkJobConfig.java
#	fairer-batch/src/main/java/com/depromeet/fairer/config/InduceAddHouseworkJobConfig.java
#	fairer-batch/src/main/java/com/depromeet/fairer/config/NotCompleteHouseworkRemindJobConfig.java
#	fairer-batch/src/main/java/com/depromeet/fairer/config/OtherMemberCompleteHouseworkJobConfig.java

Loading branch information

dskym committed Nov 15, 2022

2 parents 6616f06 + 1bb4c0b commit 296d495