tree 5f60f04ad6d7b006f75ad38751e5178d99148fff
parent adbb569fe9a64ad9bce3b53a77f1bc39ef31f682
author Anthony Sottile <asottile@umich.edu> 1464286832 -0700
committer Anthony Sottile <asottile@umich.edu> 1464286832 -0700

Fix check-merge-conflict against binary files