Commit graph

1 commit

Author SHA1 Message Date
Anthony Sottile
4a01f64c8f Fix check-merge-conflict against binary files 2016-05-26 11:20:32 -07:00