Skip to content

Commit e0507e8

Browse files
author
tp
committed
Cleaned references to versions <0.12 in docs
1 parent 1981b67 commit e0507e8

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

doc/source/io.rst

+4
Original file line numberDiff line numberDiff line change
@@ -3878,7 +3878,11 @@ create a new table!)
38783878
Iterator
38793879
++++++++
38803880

3881+
<<<<<<< HEAD
38813882
You can pass ``iterator=True`` or ``chunksize=number_in_a_chunk``
3883+
=======
3884+
Note that you can pass ``iterator=True`` or ``chunksize=number_in_a_chunk``
3885+
>>>>>>> Cleaned references to versions <0.12 in docs
38823886
to ``select`` and ``select_as_multiple`` to return an iterator on the results.
38833887
The default is 50,000 rows returned in a chunk.
38843888

0 commit comments

Comments
 (0)