6bde1a9c8d
Resolve conflicts: - .gitignore: keep nightly additions (.test, skills-lock.json) - relay/helper/price.go: keep both billingexpr and model imports - en.json / zh-CN.json: keep nightly's superset of i18n entries - service/billing_session.go: add missing 3rd arg to DecreaseUserQuota - en.json / zh-CN.json: deduplicate 129+320 duplicate i18n keys
35 lines
333 B
Plaintext
35 lines
333 B
Plaintext
.idea
|
|
.vscode
|
|
.zed
|
|
.history
|
|
upload
|
|
*.exe
|
|
*.db
|
|
build
|
|
*.db-journal
|
|
logs
|
|
web/dist
|
|
.env
|
|
one-api
|
|
new-api
|
|
/__debug_bin*
|
|
.DS_Store
|
|
tiktoken_cache
|
|
.eslintcache
|
|
.gocache
|
|
.gomodcache/
|
|
.cache
|
|
web/bun.lock
|
|
plans
|
|
.claude
|
|
|
|
electron/node_modules
|
|
electron/dist
|
|
data/
|
|
.gomodcache/
|
|
.gocache-temp
|
|
.gopath
|
|
.test
|
|
token_estimator_test.go
|
|
skills-lock.json
|