1 files changed, 6 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 623cd5318c56..8e2dd03f2a68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,13 @@
 
 pkgname=python-django-channels-redis
 _pypi_pkgname=channels_redis
+<<<<<<< HEAD
+pkgver=4.2.0
+pkgrel=0
+=======
 pkgver=4.1.0
 pkgrel=2
+>>>>>>> a1d51eb18e6b10302bd240f75206d1653d8976d3
 pkgdesc="Redis-backed ASGI channel layer implementation"
 arch=(any)
 url=" http://github.com/django/channels_redis/"
@@ -12,7 +17,7 @@ makedepends=('python-setuptools')
 depends=('python' 'python-django-channels' 'python-redis' 'python-msgpack' 'python-asgiref')
 optdepends=('python-cryptography')
 source=("https://pypi.io/packages/source/c/${_pypi_pkgname}/${_pypi_pkgname}-${pkgver}.tar.gz")
-sha256sums=('6bd4f75f4ab4a7db17cee495593ace886d7e914c66f8214a1f247ff6659c073a')
+sha256sums=('01c26c4d5d3a203f104bba9e5585c0305a70df390d21792386586068162027fd')
 
 build() {
     cd "${srcdir}/${_pypi_pkgname}-${pkgver}"