From d9182e64cbfaa29205c09d33c8bddd5b0a8cc608 Mon Sep 17 00:00:00 2001
From: Tim Golden <mail@timgolden.me.uk>
Date: Tue, 12 Nov 2013 12:51:37 +0000
Subject: Remove mis-merged artefact

---
 Lib/test/test_strftime.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Lib/test/test_strftime.py b/Lib/test/test_strftime.py
index d3f80c6..78604c6 100644
--- a/Lib/test/test_strftime.py
+++ b/Lib/test/test_strftime.py
@@ -200,8 +200,5 @@ class Y1900Tests(unittest.TestCase):
         self.assertEquals(
             time.strftime("%y", (2013, 1, 1, 0, 0, 0, 0, 0, 0)), "13")
 
-def test_main():
-    support.run_unittest(StrftimeTest, Y1900Tests)
-
 if __name__ == '__main__':
     unittest.main()
-- 
cgit v0.12