1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ec5b5db..4efae63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,10 @@
 /opendkim-2.8.3.tar.gz
 /opendkim-2.8.4.tar.gz
 /opendkim-2.9.0.tar.gz
+<<<<<<< HEAD
+=======
 /opendkim.add-user-group.patch
+>>>>>>> origin/master
 /opendkim-2.9.2.tar.gz
 /opendkim.autocreate-keys-no.patch
 /opendkim.keygen-permissions.patch