Oversight

Author: h-vetinari

pandas/io/stata.py

@@ -396,11 +396,7 @@ def parse_dates_safe(dates, delta=False, year=False, days=False):
                         to_datetime(d['year'], format='%Y').astype(np.int64))
                 d['days'] = days // NS_PER_DAY
 
-<<<<<<< HEAD
         elif infer_dtype(dates, skipna=True) == 'datetime':
-=======
-        elif infer_dtype(dates, skipna=False) == 'datetime':
->>>>>>> upstream/master
             if delta:
                 delta = dates.values - stata_epoch
                 f = lambda x: \