Compare commits

..

No commits in common. "02a430a4a482c3368d5f8f1780ad0f44002902f2" and "9583f91730e9b31d7ad74ccb13037e21340f477d" have entirely different histories.

2 changed files with 2 additions and 3 deletions

4
.gitignore vendored
View File

@ -104,5 +104,5 @@ fabric.properties
.idea/caches/build_file_checksums.ser .idea/caches/build_file_checksums.ser
/out/ /out/
/实验指导资料/ /实验指导资料/
/打包上传/ /打包上传/

View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="Encoding" defaultCharsetForPropertiesFiles="GBK"> <component name="Encoding" defaultCharsetForPropertiesFiles="GBK">
<file url="file://$PROJECT_DIR$/.gitignore" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/learn1/web/js/course-edit.js" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/learn1/web/js/course-edit.js" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/learn1/web/js/index.js" charset="UTF-8" /> <file url="file://$PROJECT_DIR$/learn1/web/js/index.js" charset="UTF-8" />
<file url="PROJECT" charset="GBK" /> <file url="PROJECT" charset="GBK" />