Merge git://anonscm.debian.org/apt/apt

Conflicts:
	.gitignore
	apt-pkg/makefile
	buildlib/config.h.in
	buildlib/environment.mak.in
	buildlib/fail.mak
	buildlib/libversion.mak
	buildlib/program.mak
	cmdline/apt-get.cc
	cmdline/makefile
	configure.ac
	debian/apt.install.in
	debian/changelog
	debian/control
	debian/libapt-pkg4.12.symbols
	debian/rules
	doc/makefile
	test/libapt/makefile

1 files changed, 4 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 0c6cae4d..3e214f59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,12 +35,14 @@
 /cmdline/apt-key
 /doc/apt-vendor.ent
 /doc/examples/sources.list
+/debian/apt.install
 /debian/libapt-pkg*.install
 /debian/libapt-inst*.install
 /debian/libapt-pkg-dev.install
 /vendor/current
-/vendor/debian/sources.list
-/vendor/ubuntu/sources.list
+<<<<<<< HEAD
+/vendor/*/sources.list
+/vendor/*/makefile.auto
 
 # autotools
 *.la