From ad2ad802636f4e575083165d9031a3a29520847f Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Wed, 26 Jan 2011 09:56:04 +0100
Subject: [PATCH] Fix forgotten merge

---
 src/utils/str.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/utils/str.py b/src/utils/str.py
index e1f9c0b14..5c6324605 100644
--- a/src/utils/str.py
+++ b/src/utils/str.py
@@ -287,10 +287,7 @@ def pluralize(s):
 @internationalizeFunction('depluralize')
 def depluralize(s):
     """Returns the singular of s."""
-<<<<<<< HEAD
     consonants = 'bcdfghjklmnpqrstvwxz'
-=======
->>>>>>> testing
     _depluralizeRegex = re.compile('[%s]ies' % consonants)
     lowered = s.lower()
     if lowered in plurals: