Fix merge error

1 files changed, 1 insertions, 1 deletions

diff --git a/git-bz b/git-bz
index 0423ce1..983876c 100755
--- a/git-bz
+++ b/git-bz
@@ -83,7 +83,7 @@ import cPickle as pickle
 from ConfigParser import RawConfigParser, NoOptionError
 import httplib
 import urllib
-from optparse import OptionParser
+import optparse
 import os
 try:
     from sqlite3 import dbapi2 as sqlite