From 870e797be1920b573d6520b0a89c420b98cada07 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <mazza@interlegis.leg.br>
Date: Fri, 8 Apr 2016 09:44:39 -0300
Subject: [PATCH] Remove linha redundante do .gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

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
-