Merge branch 'master' of github.com:skidoodle/portfolio-v2

components/Time.tsx

@@ -14,7 +14,14 @@ const Timer = () => {
 
     return(
         <div className={styles.time}>
+<<<<<<< HEAD
             <p><FaClock /> {date.toLocaleDateString('en-GB', { dateStyle: 'short' }) + ' • ' + date.toLocaleTimeString('en-GB', { timeStyle: 'medium', hour12: true,  timeZone: 'Europe/Budapest'}).toUpperCase()}</p>
+=======
+            <p><FontAwesomeIcon icon={['fas', 'clock']} /> {date.toLocaleString('en-GB', {
+                timeZone: 'Europe/Budapest',
+                hour12: true
+            }).toUpperCase()}</p>
+>>>>>>> ce3c841bfc958c99053e0a03c56b5cbc56dff70f
         </div>
     )
 }