From bcd1889d21710815dc6f7453a7a000856382d49b Mon Sep 17 00:00:00 2001
From: Nathaniel Talbott <nathaniel@talbott.ws>
Date: Thu, 5 Jul 2012 17:45:09 -0700
Subject: [PATCH] Revert "ignore *.orig files"

As per the discussion at
https://github.com/Shopify/active_merchant/commit/3c12b5, the
.gitignore file should only have project-specific artifacts in it;
developer specific artifacts should go in each developer's global
gitignore file.

This reverts commit 3c12b545327372a7f1194fc58944d57876c05982.
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 6d1ffd5a0c9..fafbf3cfb34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .yardoc
 pkg
-*.orig
 
 # ignore Gemfile.lock because we support multiple versions of Rails and
 # don't want to ship locked version requirements