git: 418da1cad0ae - main - www/py-django22: Remove django111 from CONFLICTS_INSTALL

[Wen Heping]

The branch main has been updated by wen:

URL: https://cgit.FreeBSD.org/ports/commit/?id=418da1cad0aeeb48cb9322cc98a6e9a1e99cf88b

commit 418da1cad0aeeb48cb9322cc98a6e9a1e99cf88b
Author:     Wen Heping <wen at FreeBSD.org>
AuthorDate: 2021-09-22 02:39:30 +0000
Commit:     Wen Heping <wen at FreeBSD.org>
CommitDate: 2021-09-22 02:39:30 +0000

    www/py-django22: Remove django111 from CONFLICTS_INSTALL
---
 www/py-django22/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/py-django22/Makefile b/www/py-django22/Makefile
index 2de00ad6c8bd..5d1d6faaa0d9 100644
--- a/www/py-django22/Makefile
+++ b/www/py-django22/Makefile
@@ -32,7 +32,7 @@ PORTDOCS=	*
 SHEBANG_FILES=	django/bin/django-admin.py \
 		django/conf/project_template/manage.py-tpl
 
-CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django111 ${PYTHON_PKGNAMEPREFIX}django30 \
+CONFLICTS_INSTALL=	${PYTHON_PKGNAMEPREFIX}django30 \
 			${PYTHON_PKGNAMEPREFIX}django31 ${PYTHON_PKGNAMEPREFIX}django32
 
 CPE_VENDOR=	djangoproject