From b8dd0506112ba9ff4b91cbf495dce03f288ff4d0 Mon Sep 17 00:00:00 2001 From: Dave Page Date: Tue, 15 Mar 2016 09:58:25 +0000 Subject: [PATCH] Fix typo --- tools/communityauth/sample/django/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/communityauth/sample/django/auth.py b/tools/communityauth/sample/django/auth.py index 2c8bc720..5ce4593c 100644 --- a/tools/communityauth/sample/django/auth.py +++ b/tools/communityauth/sample/django/auth.py @@ -131,7 +131,7 @@ a different username than %s. This is almost certainly caused by some legacy data in our database. Please send an email to webmaster@postgresql.eu, indicating the username -and email address from above, and we'll manually marge the two accounts +and email address from above, and we'll manually merge the two accounts for you. We apologize for the inconvenience.