resolve conflict

2019-06-26 05:13:48 +08:00
parent 1182626739 fd543fd799
commit 1f82c7cbd5
3 changed files with 25 additions and 10 deletions
@@ -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}