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