Resolve conflicting migrations

git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@402 a4c988fc-2ded-0310-b66e-134b36920a42
This commit is contained in:
lukemelia 2007-01-14 23:37:56 +00:00
parent ce2a9e2279
commit bb4b726650