Merge branch 'test'
This commit is contained in:
4
.idea/modules.xml
generated
4
.idea/modules.xml
generated
@@ -2,7 +2,11 @@
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<<<<<<< HEAD
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/jdt-admin.iml" filepath="$PROJECT_DIR$/.idea/jdt-admin.iml" />
|
||||
=======
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/admin.iml" filepath="$PROJECT_DIR$/.idea/admin.iml" />
|
||||
>>>>>>> test
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
Reference in New Issue
Block a user