From b415cb5949b26e9ed5b6857b8d50edbd6c1140d4 Mon Sep 17 00:00:00 2001
From: Grigory Starinkin <starinkin@gmail.com>
Date: Wed, 3 Jan 2018 22:17:30 +0000
Subject: [PATCH] delete accidentally added line to .gitignore during conflict
 resolve

https://github.com/posquit0/Awesome-CV/commit/55d94d780e98ef5fe3cd65cac769755853c3f53f
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 4a9b93d..38e66a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 ## Intermediate documents:
 *.dvi
 *-converted-to.*
-<<<<<<< HEAD
 
 ### Editor ###
 ## Vim & Emacs temp files: