From 30bba8fb4707b0724463fd4cbae63e42908ed5be Mon Sep 17 00:00:00 2001
From: Magnus Hagander
Date: Sat, 13 Jan 2018 18:13:09 +0100
Subject: Fix typo in comment

---
 postgresqleu/auth.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'postgresqleu/auth.py')

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.
-- 
cgit v1.2.3