5 Commits

Author	SHA1	Message	Date
morganamilo	f018c0c200	Add missing err check	2018-03-22 19:48:43 +00:00
morganamilo	7fd2a74bd2	Lint	2018-03-22 16:39:27 +00:00
morganamilo	0c0cd4f883	Add utils.go	2018-03-22 16:38:21 +00:00
morganamilo	d5015b3fe8	Add breif comments for functions in conflicts.go	2018-03-22 14:38:37 +00:00
morganamilo	4a8ec944bf	Move conflict checking to its own file	2018-03-22 07:19:25 +00:00