update for 0.4.1

zopyx · zopyx · commit 87704e2e9568 · 2021-03-09T18:12:28.000+01:00
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -1,6 +1,10 @@
 Release notes
 =============
 
+0.4.1 (2021/03/09)
+------------------
+- fixes merge conflict
+
 0.4.0 (2021/03/09)
 ------------------
 - fixes situation where there is no display name 
@@ -9,8 +13,6 @@ Release notes
   [joequant]
 - fix non-standard ports for webdav
   [joequant]
-- added caching support
-  [joequant]
 
 0.3.8 (2020/06/25)
 ------------------
diff --git a/setup.py b/setup.py
@@ -49,5 +49,5 @@
     tests_require=['docker'],
     test_suite='webdavfs.tests',
     url="http://pypi.python.org/pypi/fs.webdavfs/",
-    version="0.4.0"
+    version="0.4.1"
 )

Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,5 @@`
`49`	`49`	`tests_require=['docker'],`
`50`	`50`	`test_suite='webdavfs.tests',`
`51`	`51`	`url="http://pypi.python.org/pypi/fs.webdavfs/",`
`52`		`- version="0.4.0"`
	`52`	`+ version="0.4.1"`
`53`	`53`	`)`