From 055e53f7cca2f8507a0f75a7c237ce0d52338ad4 Mon Sep 17 00:00:00 2001
From: Fabian Holler <fabian.holler@simplesurance.de>
Date: Wed, 29 Nov 2023 14:45:28 +0100
Subject: [PATCH] gitignore: ignore *.orig files

these files are created by git mergetool
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index c882ea7..413b1bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 dependencies-tool
+*.orig