fix:conflict #144
Merged
fix:conflict #144
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
:wq erge branch 'develop' of https://github.com/LEEJaeHyeok97/2024_DANPOONG_TEAM_5_BE into develop
LEEJaeHyeok97
added a commit
that referenced
this pull request
Nov 23, 2024
* feat : updatedAt ์ถ๊ฐ * fix:conflict (#144) * feat: ์ฅ๋ฐ๊ตฌ๋ ์ถ๊ฐ ๊ธฐ๋ฅ ๊ตฌํ * feat: ์ฅ๋ฐ๊ตฌ๋ ์กฐํ ๊ธฐ๋ฅ ๊ตฌํ * feat: ์ํ ์ฃผ๋ฌธ๊ณผ ์๊ถ ์ฌ์ฉ ๊ธฐ๋ฅ ๊ตฌํ * style: ํฌ์ธํธํธ๋์ญ์ ๋ ํฌ์งํ ๋ฆฌ๋ช ๋ณ๊ฒฝ * deploy: ์ฌ๋ฐฐํฌ * deploy: ์ฌ๋ฐฐํฌ2 * deploy: ๋ก๊ทธ์ธ ๋ก์ง ์์ ์ ๋ฐ๋ฅธ ์ฌ๋ฐฐํฌ * deploy: ๋ก๊ทธ์ธ ๋ก์ง ์์ ์ ๋ฐ๋ฅธ ์ฌ๋ฐฐํฌ2 * feat: ์๊ถ ์ฌ์ฉ ๊ธฐ๋ฅ ๊ตฌํ * feat: yml ์์ ์ฌํญ ๋ฐ์ * feat: ์๊ถ ์ฌ์ฉ ๋ก์ง ์์ * feat: ์ฃผ๋ฌธ ๋ก์ง ์์ ์๋ฃ * fix: ์ฅ๋ฐ๊ตฌ๋์ ์๋ฌด๊ฒ๋ ์์ ๋ ์ฃผ๋ฌธ ์ active ๋๋ ํ์ ์์ * feat: ์ฃผ๋ฌธ ์๋ฃ ์ ๋ฆฌํด ๊ฐ ์์ * feat: ๋ด ๊ทธ๋ฃน ์กฐํ ๊ธฐ๋ฅ ๊ตฌํ * feat: ๊ธฐ๋ณธ ํ๋กํ ์ด๋ฏธ์ง url ์ถ๊ฐ * feat: ๊ทธ๋ฃน ๋ฉค๋ฒ ์ ์ฒด ์กฐํ ๊ธฐ๋ฅ ๊ตฌํ * feat: 1์ธ๋น ์ฌ์ฉ ๊ฐ๋ฅ ๊ธ์ก ์ค์ ์ปฌ๋ผ ์ถ๊ฐ * feat: ๋ด ์ง๊ฐ ์กฐํ ๊ธฐ๋ฅ ๊ตฌํ * feat: ์ ๊ฒฐ์ ๊ธฐ๋ฅ ๊ตฌํ * feat: ์ ์ ํ ํ๋ฉด ์กฐํ ๊ธฐ๋ฅ ๊ตฌํ * feat: ๊ทธ๋ฃน ์์ธ ์กฐํ ๊ธฐ๋ฅ ๊ตฌํ * feat: ๊ฐ๊ฒ ์์ธ ์กฐํ ์ฟผ๋ฆฌ ์์ * deploy: ๋ณ๊ฒฝ์ฌํญ ๋ฐ์์ ์ํ ์ปค๋ฐ * deploy: ์์ ์ฌํญ ๋ฐ์ ์ฌ๋ฐฐํฌ * deploy: rds ๊ต์ฒด๋ก ์ธํ ์ฌ๋ฐฐํฌ * deploy: rds ๊ต์ฒด๋ก ์ธํ ์ฌ๋ฐฐํฌ2 * feat: ํ ํ๋ฉด ์์ํ ์กฐํ ์ฟผ๋ฆฌ ์ ๋๋ก ์๋๋ ํ์ ํด๊ฒฐ, ๋ํ์ด๋ฏธ์ง ๋ฐํ ์ถ๊ฐ * feat: ๊ทธ๋ฃน ์์ธ ์กฐํ ์๋ต ์ปฌ๋ผ๋ช ๋ณ๊ฒฝ * feat: memberLimit ์ปฌ๋ผ ์ญ์ * feat: ์ ๊ฒฐ์ ์ ๊ธฐ์กด ๊ฒฐ์ ๋ด์ญ๊ณผ ๋ฉฑ๋ฑ์ฑ ๋ฌธ์ ํด๊ฒฐ * fix: ํ ์์ธ ์กฐํ ์ ์ด๋ฏธ์ง ์ฟผ๋ฆฌ๊ฐ ์๋ฏธ ์์ด join ๋๋ ์ฟผ๋ฆฌ ์์ * feat: ๊ฐ๊ฒ ๊ฒ์ ๊ธฐ๋ฅ ๋ํญ ์์ * feat: ํ๋ก ํธ ์๊ตฌ์ฌ ๋ฐ์ * feat: searchcondition ์ญ์ * feat: ํํ์ desription ๋ฆฌํด ํ๋๋ก ์์ * feat: ์นดํ ๊ณ ๋ฆฌ๋ณ ํ ์กฐํ ์ ํ ์์ฑ์ผ ์ปฌ๋ผ ์ถ๊ฐ * feat: ๋งค์ฅ์ฐพ๊ธฐ_์์ธ ํ์ด์ง ์กฐํ ๊ธฐ๋ฅ ๊ตฌํ * feat: ๋น๋ฐ ์ฝ๋ ์กฐํ ๊ธฐ๋ฅ ์๋ ํฌ์ธํธ ์์ * fix: conflict fix --------- Co-authored-by: HyunWoo9930 <[email protected]> Co-authored-by: Oh Hyun Woo <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[feat] PR์ ๋ฑ๋กํ๋ค.์์ ๋ด์ฉ
์ฃผ์์ฌํญ