From 6816341e5bf83497bfedc4f90b2e2f371ce10f41 Mon Sep 17 00:00:00 2001
From: gregor herrmann <gregoa@debian.org>
Date: Tue, 15 Dec 2009 00:02:30 +0100
Subject: [PATCH] .gitignore: build

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 6fe113d..60f00cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 *.pyc
 *.swp
 *.o
@@ -26,3 +27,6 @@ Makefile.in
 /stamp-h1
 config.h.in~
 src/.deps/
+=======
+build
+>>>>>>> .gitignore: build
-- 
2.39.5