合并远程更改并解决冲突

This commit is contained in:
czzhangheng 2025-09-11 11:16:34 +08:00
parent 6f0953b4ae
commit cd542e18ef
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View File

@ -161,7 +161,7 @@ cython_debug/
.idea/ .idea/
.STDEN/ .STDEN/
.data/PEMS08/ yuan
exp/ exp/
STDEN/ STDEN/
models/gpt2/ models/gpt2/

View File

@ -11,6 +11,8 @@ scipy
# 机器学习工具 # 机器学习工具
scikit-learn scikit-learn
# 配置和文件处理 # 配置和文件处理
pyyaml pyyaml