diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-24 02:21:13 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-24 02:21:13 +0800 |
| commit | aec9da081aa12281acca3a72f7b6c2b6ad16cff2 (patch) | |
| tree | 4991032e09da67a5eab5bae74635fd4f1da313bd | |
| parent | e5f2179791ffe68bd22e6779580e8f72748a7385 (diff) | |
| parent | e5137684f4b8703f96364c18904ea8328b5b2166 (diff) | |
solve conflict
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 8d9497a6a..d64e00e65 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,4 @@ build/ *.DS_Store *.pl *.bak -src/data/items.h +src/data/items.h # Autogenerated by jsonproc |