Skip to content

Commit

Permalink
fix README conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
czheo committed Feb 11, 2017
1 parent 8eb459b commit 05ca640
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,7 @@ list(1 /to/ INF /take/ 5)
# there is a `take` functon which is similar to itertools.islice
# return [1, 2, 3, 4, 5]

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

Expand Down

0 comments on commit 05ca640

Please sign in to comment.