From: Guido Draheim <guidod@gmx.de>
Date: Mon, 13 Apr 2020 09:53:15 +0000 (+0200)
Subject: igno
X-Git-Tag: v0.13.70~2^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c0b14392d7961f6e977db9da46cfe433b14af1e;p=zziplib

igno
---

diff --git a/.gitignore b/.gitignore
index f3a8a72..dd4ad8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,11 @@
 *.cache
 build
 *-linux-*
+<<<<<<< HEAD
 *.pyc
 *.tmp
 docs/man3
 docs/html
+*.tmp
+*.pyc
+__pycache__