summary refs log tree commit diff stats
path: root/.gitignore
diff options
context:
space:
mode:
authorhut <hut@hut.pm>2017-12-25 17:30:39 +0100
committerhut <hut@hut.pm>2017-12-25 17:30:39 +0100
commit0ed04b63c94b8fdc557401f5986ca81651fd0a59 (patch)
tree715d8b7e1b5b1a95a1cbaf743a1c3306846c07c8 /.gitignore
parent9a3fc5d8c90048bd02c8ca5ed8c7b0d7c46fb898 (diff)
downloadranger-0ed04b63c94b8fdc557401f5986ca81651fd0a59.tar.gz
.gitignore: add '*.orig' files (created by git merge)
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 02a51413..88c75b90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.pyo
 
 *~
+*.orig
 
 /.cache
 /build