# Conflicts: # .gitignore
# Conflicts: # doc/代码标注分工.docx # src/main/java/net/micode/notes/ui/NoteEditActivity.java