Commit 44eab56e authored by Stan Hu's avatar Stan Hu

Resolve conflicts in doc/administration/incoming_email.md

parent 92551e98
......@@ -10,11 +10,8 @@ GitLab has several features based on receiving incoming emails:
- [New merge request by email](../user/project/merge_requests/index.md#create-new-merge-requests-by-email):
allow GitLab users to create a new merge request by sending an email to a
user-specific email address.
<<<<<<< HEAD
- [Service Desk](../user/project/service_desk.md): provide e-mail support to
your customers through GitLab.
=======
>>>>>>> upstream/master
## Requirements
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment