Fix FA already defined

delete accidentally added line to .gitignore during conflict resolve (#186 )
https://github.com/posquit0/Awesome-CV/commit/55d94d780e98ef5fe3cd65cac769755853c3f53f
2019-09-08 07:33:42 +08:00 · 2019-07-08 23:52:31 +09:00
2 changed files with 1 additions and 1 deletions
@@ -11,7 +11,6 @@
 ## Intermediate documents:
 *.dvi
 *-converted-to.*
-<<<<<<< HEAD

 ### Editor ###
 ## Vim & Emacs temp files:
@@ -160,6 +160,7 @@
 %-------------------------------------------------------------------------------
 %                Configuration for fonts
 %-------------------------------------------------------------------------------
+\let\FA\relax
 % Set the FontAwesome font to be up-to-date.
 \newfontfamily\FA[Path=\@fontdir]{FontAwesome}
 % Set font for header (default is Roboto)
Author	SHA1	Message	Date
tomatocream	45a1aa5f9a	Fix FA already defined	2019-09-08 07:33:42 +08:00
Grigory Starinkin	4be6c213c8	delete accidentally added line to .gitignore during conflict resolve (#186 ) https://github.com/posquit0/Awesome-CV/commit/55d94d780e98ef5fe3cd65cac769755853c3f53f	2019-07-08 23:52:31 +09:00