merge: 同步 upstream/r-dev 并解决冲突
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -6,6 +6,7 @@ data/
|
||||
!pytests/A_memorix_test/data/real_dialogues/private_alice_weekend.json
|
||||
pytests/A_memorix_test/data/benchmarks/results/
|
||||
data1/
|
||||
mai_knowledge/knowledge.json
|
||||
mongodb/
|
||||
NapCat.Framework.Windows.Once/
|
||||
NapCat.Framework.Windows.OneKey/
|
||||
|
||||
Reference in New Issue
Block a user