diff --git a/.gitignore b/.gitignore
index 57b491858..0740715ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,6 +89,3 @@ bower
 bower_components
 media
 
-# Merge garbage
-.orig
-