aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/pyproject.toml
diff options
context:
space:
mode:
Diffstat (limited to 'pyproject.toml')
-rw-r--r--pyproject.toml4
1 files changed, 4 insertions, 0 deletions
diff --git a/pyproject.toml b/pyproject.toml
index 84422ed8..9ae7d7b1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -3,6 +3,10 @@ name = "infini"
version = "2.0.0-alpha.1"
description = "Infini 核心标准文本输入输出模块"
authors = [
+<<<<<<< HEAD
+=======
+ { name = "简律纯", email = "leader@hydroroll.team" },
+>>>>>>> 8dd7d3fe24acdbb7f52aa245f5f44991f3a44f46
{ name = "苏向夜", email = "fu050409@163.com" },
{ name = "简律纯", email = "i@jyunko.cn" },
]