diff --git a/README.md b/README.md index bc1f149..816f4f8 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,6 @@ Are you enjoy git life ? This repository is for git practice. -<<<<<<< HEAD -======= hogehoge ### process push @@ -14,12 +12,7 @@ * git add hoge/hoge.file * git commit -m "hogehoge" * git push -<<<<<<< HEAD ->>>>>>> ac455413edae60201a4d373965b37f843025223f -======= -#### 誰かが push した後は pull する -* git pull |git push|アップロード| |----|----| @@ -30,4 +23,3 @@ | Left align | Right align | Center align | |:-----------|------------:|:------------:| |左|右|中央| ->>>>>>> 5eeb773ad7d0d42f15d572384ba58480fa590edc