igno

author Guido Draheim <guidod@gmx.de>

Mon, 13 Apr 2020 09:53:15 +0000 (11:53 +0200)

committer Guido Draheim <guidod@gmx.de>

Mon, 13 Apr 2020 09:58:31 +0000 (11:58 +0200)
author Guido Draheim <guidod@gmx.de>
Mon, 13 Apr 2020 09:53:15 +0000 (11:53 +0200)
committer Guido Draheim <guidod@gmx.de>
Mon, 13 Apr 2020 09:58:31 +0000 (11:58 +0200)
diff --git a/.gitignore b/.gitignore

index f3a8a721f40fa2dceea6a048ec39696fe6a68797..dd4ad8a2f9fa92a0aa1685dfd8f7c00ba6a0bea0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,11 @@
  *.cache
  build
  *-linux-*
+<<<<<<< HEAD
  *.pyc
  *.tmp
  docs/man3
  docs/html
+*.tmp
+*.pyc
+__pycache__
author	Guido Draheim <guidod@gmx.de>
	Mon, 13 Apr 2020 09:53:15 +0000 (11:53 +0200)
committer	Guido Draheim <guidod@gmx.de>
	Mon, 13 Apr 2020 09:58:31 +0000 (11:58 +0200)