X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=640ed4bdc801855e71a2fd6809dd65fc0724fb87;hb=f1b4bee09d9fbaf5d25c4307f285b7ab4a00461a;hp=bdc33b57f2eb0992c22641797edf255987ee1a9b;hpb=a04e80a481cf21b4d9ff02d7fee615ef2af83941;p=youtube-dl diff --git a/youtube-dl b/youtube-dl index bdc33b57f..640ed4bdc 100755 --- a/youtube-dl +++ b/youtube-dl @@ -1217,7 +1217,7 @@ if __name__ == '__main__': # Parse command line parser = optparse.OptionParser( usage='Usage: %prog [options] url...', - version='2010.01.05', + version='2010.01.06', conflict_handler='resolve', )