修复XML文件无法合并的问题

leecho · Dec 6, 2018 · a613757 · a613757
1 parent 27c76f9
commit a613757
Show file tree

Hide file tree

Showing 21 changed files with 2,653 additions and 558 deletions.
diff --git a/.idea/atlassian-ide-plugin.xml b/.idea/atlassian-ide-plugin.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml
diff --git a/.idea/libraries/mybatis_generator_lombok_plugin_1_1_SNAPSHOT.xml b/.idea/libraries/mybatis_generator_lombok_plugin_1_1_SNAPSHOT.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml