tree a9dd2175eaf61d36ea65dd1de3f8e42ea844d9c6
parent cedcea550c495d536247ca23115035b17074cac7
parent eefc46f901871c75770bb58c13f6cc063dacbfed
author Anthony Sottile <asottile@umich.edu> 1431142697 -0700
committer Anthony Sottile <asottile@umich.edu> 1431142697 -0700

Merge pull request #55 from dupuy/avoid-markup-merge-conflict-fp

Don't report markup titles as merge conflicts