合并代码解决冲突

miyanhui

2019-02-18 b5413f1f00fcf13104b07807e2046372764ef8dc

1
2
3
4
5
6
7
classes= 1
train  = /home/pjreddie/data/coco/trainvalno5k.txt
#valid  = coco_testdev
valid = data/coco_val_5k.list
names = data/coco.names
backup = /home/pjreddie/backup/
eval=coco