From 330cc52c99037eaabe0fcfa09f9b099743b0b913 Mon Sep 17 00:00:00 2001
From: Brett Cannon <brett@python.org>
Date: Fri, 23 Aug 2013 12:10:09 -0400
Subject: Delete merge markers

---
 Lib/test/test_imp.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py
index 586a97c..cf27a71 100644
--- a/Lib/test/test_imp.py
+++ b/Lib/test/test_imp.py
@@ -275,7 +275,6 @@ class ImportTests(unittest.TestCase):
             return
         imp.load_module(name, None, *found[1:])
 
-<<<<<<< local
     @unittest.skipIf(sys.dont_write_bytecode,
         "test meaningful only when writing bytecode")
     def test_bug7732(self):
@@ -284,14 +283,13 @@ class ImportTests(unittest.TestCase):
             os.mkdir(source)
             self.assertRaisesRegex(ImportError, '^No module',
                 imp.find_module, support.TESTFN, ["."])
-=======
+
     def test_multiple_calls_to_get_data(self):
         # Issue #18755: make sure multiple calls to get_data() can succeed.
         loader = imp._LoadSourceCompatibility('imp', imp.__file__,
                                               open(imp.__file__))
         loader.get_data(imp.__file__)  # File should be closed
         loader.get_data(imp.__file__)  # Will need to create a newly opened file
->>>>>>> other
 
 
 class ReloadTests(unittest.TestCase):
-- 
cgit v0.12