diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-26 05:13:48 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-26 05:13:48 +0800 |
| commit | 1f82c7cbd5ee41e7104a555ff876fcb883101dcd (patch) | |
| tree | 4baed0edb1bf93d229fd87337067431e1236d45e /.gitignore | |
| parent | 1182626739fe90a687754709abc88cb896cc057e (diff) | |
| parent | fd543fd799caf59cabf55721e561fcfb0f59315d (diff) | |
resolve conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index e3cb43d69..a28828524 100644 --- a/.gitignore +++ b/.gitignore @@ -43,4 +43,5 @@ build/ *.pl *.bak src/data/items.h +src/data/items.h # Autogenerated by jsonproc tools/br_ips/{br_ips,ips_patch}{,.exe} |