Skip to content
Permalink
Browse files

Merge conflicts

  • Loading branch information
akharit committed Oct 16, 2018
2 parents cc8f446 + 4b203ee commit dc7d0537ebb6a299242c9f9d546ad6fa40ad3dd1
Showing with 3 additions and 2 deletions.
  1. +1 −1 HISTORY.rst
  2. +2 −1 azure/datalake/store/__init__.py
@@ -3,7 +3,7 @@
Release History
===============

0.0.33 (2018-10-015)
0.0.34 (2018-10-15)
+++++++++++++++++++
* Fixed concat issue with plus(or other symbols) in filename
* Added readinto method
@@ -6,7 +6,8 @@
# license information.
# --------------------------------------------------------------------------

__version__ = "0.0.33"
__version__ = "0.0.34"


from .core import AzureDLFileSystem
from .multithread import ADLDownloader

0 comments on commit dc7d053

Please sign in to comment.
You can’t perform that action at this time.