m
m
Merge branch 'master' of http://github.com/Totonut/YolOCR
A
A
mm
:x
Merge branch 'master' of http://github.com/Totonut/YolOCR
m
Merge branch 'master' of http://github.com/Totonut/YolOCR
m
Conflicts:
	Makefile
	main
	main.c