1 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 3e214f59..f3f7190a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,7 +40,6 @@
 /debian/libapt-inst*.install
 /debian/libapt-pkg-dev.install
 /vendor/current
-<<<<<<< HEAD
 /vendor/*/sources.list
 /vendor/*/makefile.auto
 
@@ -51,3 +50,9 @@
 .deps
 .dirstamp
 .libs
+
+# generated for and by abicheck
+/abicheck/apt_build.xml
+/abicheck/apt_installed.xml
+/abicheck/compat_reports/
+/abicheck/logs/