From 4893890c10f8ff06e1044ea721725114d3211ac0 Mon Sep 17 00:00:00 2001
From: Christophe Roger <darwiinc@live.fr>
Date: Sat, 8 Oct 2016 09:49:52 +1100
Subject: Updated awesome-source-cv.cls class

---
 awesome-source-cv.cls | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'awesome-source-cv.cls')

diff --git a/awesome-source-cv.cls b/awesome-source-cv.cls
index a73761c..4a3a913 100755
--- a/awesome-source-cv.cls
+++ b/awesome-source-cv.cls
@@ -102,12 +102,7 @@
 \newlength{\leftcolumn}
 \setlength{\leftcolumn}{2.5cm}
 
-<<<<<<< Updated upstream
-% Macros
-
-=======
 % Font Awesome icons aliases
->>>>>>> Stashed changes
 \newcommand{\mailSymbol}{\faAt}
 \newcommand{\locationSymbol}{\faMapMarker}
 \newcommand{\infoSymbol}{\faInfo}
-- 
cgit v1.2.3

