diff options
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index eeaf99a61cea..e7f545baa552 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,6 @@ !ChangeLog !*.diff !*.patch +<<<<<<< HEAD +!*.desktop +!*.xml |