Git attribute merge=union for HISTORY.rst to prevent merge conflicts
Git attribute merge=union for HISTORY.rst to prevent merge conflicts

arnau126/django-mysql,arnau126/django-mysql,nickmeharry/django-mysql,nickmeharry/django-mysql,adamchainz/django-mysql