解决冲突

2 years ago · cac298439a
parent 6352b3ce25
commit cac298439a
3 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,4 @@
 /doc/~$模板-开源软件泛读、标注和维护报告文档 .docx
 /src/Notes-master1/
+/src/Notes-master1/
+/.idea/
--- a/doc/~$模板-开源软件泛读、标注和维护报告文档
+++ b/doc/~$模板-开源软件泛读、标注和维护报告文档
--- a/doc/小米便签泛读.docx
+++ b/doc/小米便签泛读.docx