summarylogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 9ad0e6903b3..e7f545baa55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,6 @@
!ChangeLog
!*.diff
!*.patch
+<<<<<<< HEAD
!*.desktop
!*.xml