zhailw
/
gdms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/wmj' into wlf

Browse Source 
# Conflicts:
#	src/core/process/C_StudentUploadOpeningReport.java
wlf
wlf 6 years ago
parent 1c945a05d7
commit 687ce0df5b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
.idea/misc.xml
Unescape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="10" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="11" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>
Write Preview
Loading…
Cancel
Save