# Conflicts: # lidee-core/src/main/java/com/lideeyunji/core/framework/entity/ReportFieldEntity.java # lidee-core/src/main/java/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.java # lidee-core/target/classes/com/lideeyunji/core/framework/entity/ReportFieldEntity.class # lidee-core/target/classes/com/lideeyunji/core/framework/service/impl/ReportServiceImpl.class
7 lines
235 B
XML
7 lines
235 B
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="VcsDirectoryMappings">
|
|
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
|
</component>
|
|
</project> |