From 9c0b14392d7961f6e977db9da46cfe433b14af1e Mon Sep 17 00:00:00 2001
From: Guido Draheim <guidod@gmx.de>
Date: Mon, 13 Apr 2020 11:53:15 +0200
Subject: [PATCH] igno

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

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__
-- 
2.40.0