# Conflicts: # inside-notices/pom.xml # inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PrivateMessageController.java # start/src/main/resources/bootstrap.yml # start/src/test/java/cn/axzo/msg/center/message/service/PendingMessageNewServiceTest.java |
||
|---|---|---|
| .. | ||
| src | ||
| pom.xml | ||