Skip to main content

Browse the archive

Revision 0346a66bc84057a91aa9dceba918b338397fc1d8 authored by Nathan Nutter on 20 June 2012, 20:08:08 UTC, committed by Nathan Nutter on 20 June 2012, 20:08:08 UTC 
remove upstream merge conflict
 
I am guessing this is the correct way to resolve it based on symmetry
with the lines below it.
1 parent 252b2e6
Raw File
Directory is empty
back to top