diff options
| author | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-13 11:02:54 +0800 |
|---|---|---|
| committer | Jordan Gong <jordan.gong@protonmail.com> | 2021-01-13 11:02:54 +0800 |
| commit | 356ad035d85936c7896abd049319d18ad7f3df94 (patch) | |
| tree | ea338e4e7560dcecfb466fa495978d9ccea5d31f /.idea/gait-recognition.iml | |
| parent | 37e307b960d565e7a58dfd22d0506c0f6f4fd122 (diff) | |
| parent | 8ee391b65e2b48d777a268749f54b3aa9e4b9142 (diff) | |
Merge branch 'master' into python3.8
# Conflicts:
# models/model.py
Diffstat (limited to '.idea/gait-recognition.iml')
| -rw-r--r-- | .idea/gait-recognition.iml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.idea/gait-recognition.iml b/.idea/gait-recognition.iml index e175a98..79e2f3e 100644 --- a/.idea/gait-recognition.iml +++ b/.idea/gait-recognition.iml @@ -5,7 +5,7 @@ <excludeFolder url="file://$MODULE_DIR$/venv" /> <excludeFolder url="file://$MODULE_DIR$/data" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="Python 3.9 (gait-recognition)" jdkType="Python SDK" /> <orderEntry type="sourceFolder" forTests="false" /> </component> <component name="PyDocumentationSettings"> |