cmdutils: remove #if 0-ed conflict marger trash that i forgot
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Jul 2011 19:27:13 +0000 (21:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 14 Jul 2011 19:27:13 +0000 (21:27 +0200)
commit8bc3a4807e2da36f458e7784c3d390dbd19899a5
tree0e6cf4e0f125f3e6c702479a68804e6f2e2bb203
parent321b2a9ded0468670b7678b7c098886930ae16b2
cmdutils: remove #if 0-ed conflict marger trash that i forgot

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
cmdutils.c