-
# Conflicts: # src/main/resources/templates/config/receiptPreference/list.html
-
Conflicts: .idea/workspace.xml src/main/resources/static/css/style.css src/main/resources/templates/config/receiptPreference/edit.html src/main/resources/templates/task/taskHeader/taskHeader.html
-
# Conflicts: # .gitignore # .idea/misc.xml # .idea/workspace.xml # huaheng.iml
-
# Conflicts: # .idea/workspace.xml