iSharkFly-Open/Java-Tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into code_bank

Browse Source 
# Conflicts:
#	.idea/workspace.xml
This commit is contained in:
YuCheng Hu
2021-04-23 16:06:21 -04:00
parent 5510d7f579 d99b4dbdb3
commit 75dad45f99
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/compiler.xml
Generated
+1
View File
@@ -15,6 +15,7 @@
<module name="cwiki-us-demo-tutorials.spring-batch.main" target="11" />
<module name="cwiki-us-demo-tutorials.spring-batch.test" target="11" />
<module name="lang-tutorial" target="1.5" />
<module name="parent-modules" target="11" />
</bytecodeTargetLevel>
</component>
</project>
.idea/modules.xml
Generated
+1
View File
@@ -8,6 +8,7 @@
<module fileurl="file://$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.main.iml" filepath="$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.test.iml" filepath="$PROJECT_DIR$/.idea/modules/spring-batch/cwiki-us-demo-tutorials.spring-batch.test.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/cwiki-us-demo-tutorials.test.iml" filepath="$PROJECT_DIR$/.idea/modules/cwiki-us-demo-tutorials.test.iml" />
<module fileurl="file://$PROJECT_DIR$/parent-modules.iml" filepath="$PROJECT_DIR$/parent-modules.iml" />
</modules>
</component>
</project>