From 2f613d6daa87db8e765f26ca526fce4fab09462f Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Fri, 26 Mar 2021 15:12:45 +0200
Subject: [PATCH] .gitignore update

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b704047c..b1a284a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,12 @@ local.properties
 .DS_Store
 *~
 *.iml
+*.orig
+*.rej
 .gradle
 /local.properties
 /.idea/workspace.xml
 /.idea/libraries
-.DS_Store
 build
 /captures
 .externalNativeBuild