From 8dd917dfe5ad82096eb2547caa83690341dbd516 Mon Sep 17 00:00:00 2001
From: Michael Tryby <tryby.michael@epa.gov>
Date: Wed, 30 Jan 2019 13:35:24 -0500
Subject: [PATCH] Adding *.orig to .gitignore

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 3c617e0..a20656a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -227,3 +227,7 @@ tests/data/
 #Cmake stuff
 buildprod*/
 *_export.h
+
+
+# git merge
+*.orig