Fix botched merge

Author: ambv

Lib/_pyrepl/simple_interact.py

@@ -30,11 +30,6 @@
 import os
 import sys
 import code
-<<<<<<< HEAD
-=======
-import warnings
-import errno
->>>>>>> c91ad5da9d9 (gh-128066: Properly handle history file writes for RO fs on PyREPL (gh-134380))
 
 from .readline import _get_reader, multiline_input