From 215bc8614c49b30578996d882642a29cc5aebebe Mon Sep 17 00:00:00 2001
From: Ken Johnson <cktricky@Kens-MacBook-Pro.local>
Date: Tue, 4 Jun 2013 16:04:58 -0400
Subject: [PATCH] removed orig

---
 .gitignore.orig | 22 ----------------------
 1 file changed, 22 deletions(-)
 delete mode 100755 .gitignore.orig

diff --git a/.gitignore.orig b/.gitignore.orig
deleted file mode 100755
index 2e2dfde..0000000
--- a/.gitignore.orig
+++ /dev/null
@@ -1,22 +0,0 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-
-# Ignore bundler config
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp
-.elasticbeanstalk/
-
-<<<<<<< HEAD
-=======
-# Ignore Mac folder settings
->>>>>>> d9f4ac72d59c99ffa009f32b1a51ed5f13ab067f
-.DS_Store