Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
44eab56e
Commit
44eab56e
authored
Mar 02, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in doc/administration/incoming_email.md
parent
92551e98
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
doc/administration/incoming_email.md
doc/administration/incoming_email.md
+0
-3
No files found.
doc/administration/incoming_email.md
View file @
44eab56e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment