Skip to content

Commit e89e36d

Browse files
oleksii-polovyioleksii-polovyi
authored
Update indexing.rst
1 parent 39f4afc commit e89e36d

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎doc/source/reference/indexing.rst

-4
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,6 @@ Time/Date Components
349349
DatetimeIndex.date
350350
DatetimeIndex.time
351351
DatetimeIndex.timetz
352-
<<<<<<< HEAD
353-
DatetimeIndex.day_of_year
354-
=======
355-
>>>>>>> f990e59e07086d36884a25bcf380ef85ec457a76
356352
DatetimeIndex.day_of_year
357353
DatetimeIndex.weekofyear
358354
DatetimeIndex.week

0 commit comments

Comments
 (0)