From 3e345fa60093b967dce5f011e33c7aec76221e69 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Wed, 17 Sep 2014 06:33:26 -0300
Subject: [PATCH] fix gitignore

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8aa3d8515..640ac6f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,7 +77,6 @@ dist/windows
 dist/*.dmg
 dist/*.tar.gz
 dist/*.exe
-<<<<<<< HEAD
 
 doc/
 /node_modules