fixed conflict and comment

37b4cfea · karen Carias · 8344c795 · 37b4cfea
Commit 37b4cfea authored Aug 10, 2015 by karen Carias
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

doc/workflow/notifications.md doc/workflow/notifications.md +1 -1

No files found.
--- a/doc/workflow/notifications.md
+++ b/doc/workflow/notifications.md
@@ -97,4 +97,4 @@ In all of the below cases, the notification will be sent to:
 You won't receive notifications for Issues, Merge Requests or Milestones
 created by yourself. You will only receive automatic notifications when
 somebody else comments or adds changes to the ones that you've created or
-mentions you. 
+mentions you.