Merge changes I seem to have removed locally

mangolang · Apr 28, 2018 · 221b560 · 221b560
1 parent 9ddfd91
commit 221b560
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/dev/hooks/utils/message_validation.py b/dev/hooks/utils/message_validation.py
@@ -24,6 +24,8 @@ def __init__(self, msg):
 
 
 def validate_title(title):
+	if title[:5].lower() == 'merge':
+		return
 	if title[0] in string.ascii_lowercase:
 		raise ValidationError('Commit message title should start with a capital letter')
 	if title[-1] == '.':