summaryrefslogtreecommitdiffstats
path: root/awesome-source-cv.cls
diff options
context:
space:
mode:
authorChristophe Roger <darwiinc@live.fr>2016-10-08 09:49:52 +1100
committerChristophe Roger <darwiinc@live.fr>2016-10-08 09:49:52 +1100
commit4893890c10f8ff06e1044ea721725114d3211ac0 (patch)
treed8e60574f203e1fa93732a50ccd14a76d508f692 /awesome-source-cv.cls
parent7b0aaf7edd62e152256f8bee5c3e4137dd3823b3 (diff)
downloadcv-4893890c10f8ff06e1044ea721725114d3211ac0.tar.gz
cv-4893890c10f8ff06e1044ea721725114d3211ac0.tar.bz2
cv-4893890c10f8ff06e1044ea721725114d3211ac0.tar.xz
cv-4893890c10f8ff06e1044ea721725114d3211ac0.zip
Updated awesome-source-cv.cls class
Diffstat (limited to 'awesome-source-cv.cls')
-rwxr-xr-xawesome-source-cv.cls5
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}