From 0ed04b63c94b8fdc557401f5986ca81651fd0a59 Mon Sep 17 00:00:00 2001
From: hut <hut@hut.pm>
Date: Mon, 25 Dec 2017 17:30:39 +0100
Subject: .gitignore: add '*.orig' files (created by git merge)

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

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 02a51413..88c75b90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.pyo
 
 *~
+*.orig
 
 /.cache
 /build
-- 
cgit 1.4.1-2-gfad0