Skip to content

Commit 05ca640

Browse files
author
czheo
committed
fix README conflict
1 parent 8eb459b commit 05ca640

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,11 +160,7 @@ list(1 /to/ INF /take/ 5)
160160
# there is a `take` functon which is similar to itertools.islice
161161
# return [1, 2, 3, 4, 5]
162162

163-
<<<<<<< HEAD
164-
list(0 /to/ NEGINF /step/ 2 /take/ 5)
165-
=======
166163
list(0 /to/ -INF /by/ 2 /take/ 5)
167-
>>>>>>> 8d9979391206cfdf63a5decf720bfd1c31549685
168164
# also works with negative infinity.
169165
# return [0, -2, -4, -6, -8]
170166

0 commit comments

Comments
 (0)