From 008ed5a32cd9567a276bd91857d9273f3068247a Mon Sep 17 00:00:00 2001
From: Brandon H <hurlburb@microsoft.com>
Date: Wed, 27 Mar 2019 09:27:53 -0700
Subject: [PATCH] adding .orig to ignored extensions due to merge conflict
 resolution for most merge tools

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

diff --git a/.gitignore b/.gitignore
index 358c43bac..605c6d654 100644
--- a/.gitignore
+++ b/.gitignore
@@ -293,3 +293,4 @@ __pycache__/
 # Local Jekyll output
 _site/*
 docs/_site/*
+*.orig