合并远程更改并解决冲突

2025-09-11 11:16:34 +08:00 · 2025-09-11 11:16:34 +08:00 · cd542e18ef
parent 6f0953b4ae
commit cd542e18ef
2 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -161,7 +161,7 @@ cython_debug/
 .idea/

 .STDEN/
-.data/PEMS08/
+yuan
 exp/
 STDEN/
 models/gpt2/
--- a/requirements.txt
+++ b/requirements.txt
@ -11,6 +11,8 @@ scipy
 # 机器学习工具
 scikit-learn

+
+
 # 配置和文件处理
 pyyaml