Skip to content

A
angle
Commit 23ee2382 by Jamie Madill Committed by Shannon Woods
Options

Ignore .orig files, which result from merge conflicts.

TRAC #23158 Signed-off-by: Nicolas Capens Authored-by: Jamie Madill
parent b5ce077e
Showing with 1 addition and 0 deletions
.gitignore
...@@ -10,4 +10,5 @@ patches-* ...@@ -10,4 +10,5 @@ patches-*
ipch ipch
debug.txt debug.txt
*.opensdf *.opensdf
*.orig
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