summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorkaren Carias <karen@gitlab.com>2015-08-10 16:05:59 -0700
committerkaren Carias <karen@gitlab.com>2015-08-10 16:05:59 -0700
commit37b4cfea3aa06b9046f8577be5f4cd7bcdf8017a (patch)
tree744caca015748626b3a868bff5becdcef3de2995 /doc
parent8344c7950838a4f83307a208865dad4b28ee3b96 (diff)
downloadgitlab-ce-37b4cfea3aa06b9046f8577be5f4cd7bcdf8017a.tar.gz
fixed conflict and comment
Diffstat (limited to 'doc')
-rw-r--r--doc/workflow/notifications.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/workflow/notifications.md b/doc/workflow/notifications.md
index 32b515ca238..5415fedf29e 100644
--- 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.