Skip to content

Commit

Permalink
Solve Conflict
Browse files Browse the repository at this point in the history
Signed-off-by: SeoJimin <jnuni1004@naver.com>
  • Loading branch information
SeoJimin1234 committed Jul 26, 2024
2 parents b3d534b + 59c55e1 commit e6c4fa7
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pages/2024/members.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@
16. [이설희](https://argo-oss.github.io/2024/members/LeeSeolHui)
17. [정찬영](https://argo-oss.github.io/2024/members/ChanYeongJeong)
18. [허인주](https://argo-oss.github.io/2024/members/HuhInJoo)
19. [서지민](https://argo-oss.github.io/2024/members/SeoJimin)
19. [정은지](https://argo-oss.github.io/2024/members/EunJiJung)
20. [서지민](https://argo-oss.github.io/2024/members/SeoJimin)
12 changes: 12 additions & 0 deletions pages/2024/members/EunJiJung.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- name : 정은지
- github : [bianbbc87](https://github.com/bianbbc87)
- age : 02년생
- blog : https://velog.io/@bian87

---

안녕하세요 ! ArgoCD 멘티 정은지입니다.

ArgoCD에 기여하며 쿠버네티스 환경을 배우고, 함께 소통하며 많이 배워가고 싶습니다. :)

열심히 참여하겠습니다. 잘 부탁드립니다~! 😊
12 changes: 12 additions & 0 deletions pages/2024/members/HyeonJiJung.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
- name : 정현지
- github : [HNJI](https://github.com/Hyeonji-Jung)
- age : 99년생
- blog : [velog](https://velog.io/@welloff_jj)

---

안녕하세요 주니어 백엔드 개발자 (1개월차🐣) 정현지입니다 !
오픈소스 기여를 해보고 싶다는 생각이 항상 있었는데 이번 기회로 참여하게 되어 기쁩니다 🙂

k8s도, ArgoCD 경험이 적고 Golang은 처음이지만 최선을 다해 임하겠습니다.
11주 동안 잘 부탁드립니다 🔥
4 changes: 3 additions & 1 deletion pages/2024/members/_meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,7 @@
"LeeSeolHui": "이설희",
"ChanYeongJeong": "정찬영",
"HuhInJoo": "허인주",
"SeoJimin": "서지민"
"HyeonJiJung": "정현지",
"EunJiJung": "정은지",
"SeoJimin" : "서지민"
}

0 comments on commit e6c4fa7

Please sign in to comment.