diff --git a/README.md b/README.md index f7b86fa5..9f4fc76f 100644 --- a/README.md +++ b/README.md @@ -80,10 +80,15 @@ - [代码可读性](https://github.com/CyC2018/CS-Notes/blob/master/notes/代码可读性.md) - [代码风格规范](https://github.com/CyC2018/CS-Notes/blob/master/notes/代码风格规范.md) +<<<<<<< HEAD