summaryrefslogtreecommitdiff
path: root/postgresqleu/auth.py
diff options
context:
space:
mode:
Diffstat (limited to 'postgresqleu/auth.py')
-rw-r--r--postgresqleu/auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/postgresqleu/auth.py b/postgresqleu/auth.py
index 1c7708a5..1cc094fb 100644
--- a/postgresqleu/auth.py
+++ b/postgresqleu/auth.py
@@ -136,7 +136,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.