# Conflicts: # Notes-master/app/src/main/AndroidManifest.xml # Notes-master/app/src/main/java/net/micode/notes/ui/NotesListActivity.java # doc/实践资源-开源软件维护方案及成果.docx
同意
1