Resolve conflicts from merge of graphconvert branch
authorTara L Andrews <tla\@mit.edu>
Wed, 28 Dec 2011 02:33:50 +0000 (03:33 +0100)
committerTara L Andrews <tla\@mit.edu>
Wed, 28 Dec 2011 02:33:50 +0000 (03:33 +0100)
commit0da1ffab0cb9c1c328843041792de664440049df
tree3ce89165ef72f6f522cd67212576d3ed1fc386d9
parentaa71409fa9c0ca9fa7439af1cee03f300cbc05ff
parentb74d89f9e926466ba4ded77746fd0f98912cc17a
Resolve conflicts from merge of graphconvert branch

Conflicts:
lib/Text/Tradition/Collation.pm
lib/Text/Tradition/Collation/Relationship.pm
lib/Text/Tradition/Witness.pm