Fix conflict "fix"

Author: StanFromIreland

Lib/test/test_time.py

@@ -358,13 +358,8 @@ def test_strptime(self):
         # Should be able to go round-trip from strftime to strptime without
         # raising an exception.
         tt = time.gmtime(self.t)
-<<<<<<< e-d-no-year
-        for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'e', 'H', 'I',
-                          'j', 'm', 'M', 'p', 'S',
-=======
-        for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'F', 'H', 'I',
+        for directive in ('a', 'A', 'b', 'B', 'c', 'd', 'e', 'F', 'H', 'I',
                           'j', 'm', 'M', 'p', 'S', 'T',
->>>>>>> main
                           'U', 'w', 'W', 'x', 'X', 'y', 'Y', 'Z', '%'):
             format = '%' + directive
             if directive in ('d', 'e'):