[pypy-commit] pypy stdlib-2.7.4: removed dead import

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: stdlib-2.7.4
Changeset: r66200:80a41d701907
Date: 2013-08-18 15:42 -0700
http://bitbucket.org/pypy/pypy/changeset/80a41d701907/

Log:	removed dead import

diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py
--- a/pypy/config/pypyoption.py
+++ b/pypy/config/pypyoption.py
@@ -3,7 +3,7 @@
 import py
 
 from rpython.config.config import (OptionDescription, BoolOption, IntOption,
-  ChoiceOption, StrOption, to_optparse, ConflictConfigError)
+  ChoiceOption, StrOption, to_optparse)
 from rpython.config.translationoption import IS_64_BITS