mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-14 14:49:21 +01:00
Fix forgotten merge
This commit is contained in:
parent
1cceeb7ad1
commit
ad2ad80263
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user