fixed conflict

This commit is contained in:
lixiaopeng
2021-08-10 16:54:29 +08:00
parent 228413344f
commit 3d6661b603
3 changed files with 92 additions and 78 deletions

2
.idea/misc.xml generated
View File

@@ -32,7 +32,7 @@
</map>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="VisualizationToolProject">