From 7b0aaf7edd62e152256f8bee5c3e4137dd3823b3 Mon Sep 17 00:00:00 2001
From: Christophe Roger <darwiinc@live.fr>
Date: Sat, 1 Oct 2016 08:26:33 +1100
Subject: Updated comment on style

---
 awesome-source-cv.cls | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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

diff --git a/awesome-source-cv.cls b/awesome-source-cv.cls
index 90d6827..a73761c 100755
--- a/awesome-source-cv.cls
+++ b/awesome-source-cv.cls
@@ -78,6 +78,7 @@
 \defaultfontfeatures{Mapping=tex-text}
 %
 
+% Define font to use according to localFont option
 \ifthenelse{\isundefined{\@local}}
 {
   %\setmainfont[BoldFont = Helvetica Neue, ItalicFont=Helvetica Neue Thin Italic ,SmallCapsFont = Helvetica Neue Light]{Helvetica Neue Thin}
@@ -101,8 +102,12 @@
 \newlength{\leftcolumn}
 \setlength{\leftcolumn}{2.5cm}
 
+<<<<<<< Updated upstream
 % Macros
 
+=======
+% Font Awesome icons aliases
+>>>>>>> Stashed changes
 \newcommand{\mailSymbol}{\faAt}
 \newcommand{\locationSymbol}{\faMapMarker}
 \newcommand{\infoSymbol}{\faInfo}
@@ -187,7 +192,7 @@
   \resumetitle{\@tagline}
 }
 
-%Resume part title definition
+% Resume part title definition
 \newcommand\sectionTitle[2]{\section{\texorpdfstring{\accentColor#2\enspace #1}{#1}}}
 
 % Define the 'experiences' environment
@@ -196,6 +201,7 @@
 }{%
   \end{longtable}
 }
+
 % Render an experience in the experiences environment
 % Usage: 
 %  {<End date>}      {<Title>}{<Enterprise>}{<Country>}
-- 
cgit v1.2.3


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

