1 files changed, 0 insertions, 5 deletions
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}