Undo unnecessary reformatting that is complicating the merges

This commit is contained in:
Manuel Amador (Rudd-O) 2010-08-20 12:24:59 -07:00
parent f0b82f8565
commit eae268d5d9