Merge remote-tracking branch 'refs/remotes/origin/master'

#Conflicts: # _data/contact.yml
lotusk08 · Feb 19, 2024 · f1de6f7 · f1de6f7
2 parents eb2a846 + fbdf2d6
commit f1de6f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/_data/authors.yml b/_data/authors.yml
@@ -8,6 +8,6 @@
 
 cotes:
   name: Steve Hoang
-  twitter: LotusK08
+  #twitter: LotusK08
   url: https://github.com/lotusk08/
 
diff --git a/_data/contact.yml b/_data/contact.yml
@@ -3,12 +3,15 @@
 - type: github
   icon: "fab fa-github"
 
+<<<<<<< HEAD
 - type: reddit
   icon: 'fab fa-reddit'
 
 - type: facebook
   icon: 'fab fa-facebook'
 
+=======
+>>>>>>> master
 # - type: twitter
 #   icon: "fa-brands fa-x-twitter"