From 94c71201b0c64204e16cb6b5f7d2cc90cb4cf1c6 Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Tue, 2 Feb 2010 12:56:03 +0100
Subject: merge conflict

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index bfbb2057..63932d69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@ src/Hooks/abrt-hook-ccpp
 src/Hooks/abrt-hook-python
 stamp-h1
 x86_64/
+*.pyc
-- 
cgit