Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Corryvreckan
Corryvreckan
Commits
e9cb4506
Commit
e9cb4506
authored
Nov 06, 2018
by
Simon Spannagel
Browse files
Ignore git merge conflict files
parent
22a15378
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
e9cb4506
...
...
@@ -31,3 +31,6 @@ CMakeLists.txt.user
*.d
*.so
*.pcm
# Ignore conflict files:
*.orig
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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