Conflict Resolution

brian_d_foy on 2004-02-03T22:32:17

I may not be able to resolve conflict in Iraq, but I can resolve them in CVS.