Skip to content

Commit 567859b

Browse files
committed
fix: merge conflict
1 parent 4e86422 commit 567859b

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,7 @@ GitHub 技术社区 [Doocs](https://github.com/doocs),致力于打造一个内
387387
</tr>
388388
</table>
389389

390-
<<<<<<< HEAD
391-
关注公众号「**Doocs**」,回复 **PDF**,即可获取 [互联网 Java 工程师进阶知识完全扫盲](https://github.com/doocs/advanced-java) 项目离线 PDF 文档(283 页精华),学习更加方便!
392-
=======
390+
393391
关注「**Doocs**」公众号,回复 **PDF**,即可获取 [互联网 Java 工程师进阶知识完全扫盲](https://github.com/doocs/advanced-java) 项目离线 PDF 文档(283 页精华),学习更加方便!
394-
>>>>>>> d309ac0 (docs: update documents)
395392

396393
![](./images/pdf.png)

0 commit comments

Comments
 (0)