Skip to content

Commit fa4f220

Browse files
authored
Docs: Resolve conflict
1 parent f2360a4 commit fa4f220

1 file changed

Lines changed: 4 additions & 5 deletions

File tree

β€ŽREADME.mdβ€Ž

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@
2222

2323
> **Handover**λŠ” 보직 λ³€κ²½ λ“±μ˜ μƒν™©μ—μ„œ 효율적이고 μ •ν™•ν•˜μ§€ μ•Šμ€ μΈμˆ˜μΈκ³„λ‘œ 인해<br>
2424
> **μƒˆλ‘œμš΄ 업무 ν™˜κ²½μ— 적응**ν•˜λŠ” 것에 어렀움을 κ²ͺκ±°λ‚˜ **μ—…λ¬΄μ˜ 곡백**이 μƒκΈ°λŠ” λ¬Έμ œμ μ„ ν•΄κ²°ν•˜κ³ μž ν•©λ‹ˆλ‹€.
25-
>
25+
>
2626
> 더 λ‚˜μ•„κ°€, λΆ€λŒ€ κ°„ 효율적인 업무 방법을 κ³΅μœ ν•˜λŠ”<br>
2727
> **톡합적 업무 곡유 ν”Œλž«νΌ**을 μ œκ³΅ν•˜λŠ” 것을 λͺ©ν‘œλ‘œ ν•˜κ³  μžˆμŠ΅λ‹ˆλ‹€.
28-
2928
## πŸ“– λͺ©μ°¨
3029

3130
<ol>
@@ -91,7 +90,7 @@ Handover λ‚΄μ˜ λͺ¨λ“  λ¬Έμ„œλŠ” **πŸ—„οΈ μ„œλž, πŸ“° λ¬Έμ„œ, πŸ“‡ μΉ΄λ“œ**
9190
|:---:|:---:|:---:|:---:|
9291
|βœ” (84+)|βœ” (84+)|βœ” (63+)|βœ” (14.1+)|
9392

94-
<h2 id="expectation"> ✨ Handover 의 κΈ°λŒ€νš¨κ³Ό (Expectation) </h2>
93+
<h2 id="expectation"> ✨ Handover 의 κΈ°λŒ€νš¨κ³Ό (Expectations) </h2>
9594

9695
### πŸ‘ μΈμˆ˜μΈκ³„ λ°©μ‹μ˜ 체계화
9796
- κ³΅ν†΅λœ μΈμˆ˜μΈκ³„ λ¬Έμ„œ μž‘μ„± ν”Œλž«νΌμ„ ν†΅ν•œ **μΈμˆ˜μΈκ³„ 방식 톡일**
@@ -138,7 +137,7 @@ Handover λ‚΄μ˜ λͺ¨λ“  λ¬Έμ„œλŠ” **πŸ—„οΈ μ„œλž, πŸ“° λ¬Έμ„œ, πŸ“‡ μΉ΄λ“œ**
138137
- [Sass](https://sass-lang.com/)
139138
- [webpack](https://webpack.kr/)
140139

141-
<h2 id="install"> πŸš€ μ„€μΉ˜ μ•ˆλ‚΄ (Installaltion Methods) </h2>
140+
<h2 id="install"> πŸš€ μ„€μΉ˜ μ•ˆλ‚΄ (Installation Methods) </h2>
142141

143142
### 1. Repository Clone
144143

@@ -326,6 +325,6 @@ Handover에 κΈ°μ—¬ν•˜κ³  μ‹ΆμœΌμ‹œλ‹€λ©΄, **[Contributing.md](Contributing.md)**
326325
</tbody>
327326
</table>
328327

329-
<h2 id="license"> πŸ“ μ €μž‘κΆŒ 및 μ‚¬μš©κΆŒ 정보 (Copyright / End User License) </h2>
328+
<h2 id="license"> πŸ“ μ €μž‘κΆŒ 정보 (Copyright) </h2>
330329

331330
- [**MIT License**](./LICENSE)

0 commit comments

Comments
Β (0)