Commit History

Author SHA1 Message Date
  morganamilo d5015b3fe8 Add breif comments for functions in conflicts.go 7 years ago
  morganamilo 4a8ec944bf Move conflict checking to its own file 7 years ago