Skip to content

TEST: Check merge conflict #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

TEST: Check merge conflict #18

wants to merge 7 commits into from

Conversation

devpla
Copy link
Owner

@devpla devpla commented Aug 24, 2021

No description provided.

devpla added 7 commits August 24, 2021 19:32
resolved #8

- 데이터베이스 설치
- 모델 생성 및 활성화
- 모델 메서드 추가 및 api 사용
resolved #9

- 관리자 생성
- polls app 관리자 사이트에 등록
@devpla devpla added 🐞 BUG 버그 발견 (이슈 보고용) 🔀 MERGE 병합 커밋 🧪 TEST 테스트 추가 labels Aug 24, 2021
@devpla devpla closed this Aug 24, 2021
@devpla devpla deleted the test branch August 24, 2021 12:05
@devpla devpla changed the title TEST: Fix merge conflict TEST: Check merge conflict Aug 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🐞 BUG 버그 발견 (이슈 보고용) 🔀 MERGE 병합 커밋 🧪 TEST 테스트 추가
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant