summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index eeaf99a61ce..e7f545baa55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
!ChangeLog
!*.diff
!*.patch
+<<<<<<< HEAD
+!*.desktop
+!*.xml