From: Tara L Andrews <tla\@mit.edu>
Date: Wed, 28 Dec 2011 02:33:50 +0000 (+0100)
Subject: Resolve conflicts from merge of graphconvert branch
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=0da1ffab0cb9c1c328843041792de664440049df;p=scpubgit%2Fstemmatology.git

Resolve conflicts from merge of graphconvert branch

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

0da1ffab0cb9c1c328843041792de664440049df