Skip to content

Commit

Permalink
Docs: Resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
134130 authored Oct 20, 2021
1 parent f2360a4 commit fa4f220
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,9 @@

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

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

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

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

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

### 1. Repository Clone

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

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

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

0 comments on commit fa4f220

Please sign in to comment.