diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-02-02 12:56:03 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-02-02 12:56:03 +0100 |
| commit | 94c71201b0c64204e16cb6b5f7d2cc90cb4cf1c6 (patch) | |
| tree | 042e2258aecbf06e316a304aa9b6f1e96f564ae3 /.gitignore | |
| parent | b026e372e6f18ef34d1e23abecd584c2914b1cf1 (diff) | |
| download | abrt-94c71201b0c64204e16cb6b5f7d2cc90cb4cf1c6.tar.gz abrt-94c71201b0c64204e16cb6b5f7d2cc90cb4cf1c6.tar.xz abrt-94c71201b0c64204e16cb6b5f7d2cc90cb4cf1c6.zip | |
merge conflict
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -54,3 +54,4 @@ src/Hooks/abrt-hook-ccpp src/Hooks/abrt-hook-python stamp-h1 x86_64/ +*.pyc |