hyro/website
1
0
Fork 0
mirror of https://github.com/xHyroM/website.git synced 2024-11-22 15:01:05 +01:00
Code Issues Projects Releases Wiki Activity Actions

fix: resolve conflicts

Browse source
This commit is contained in:
xHyroM 2023-05-07 14:29:11 +02:00
parent 6155e58ed1
commit 9f0ce385f1
No known key found for this signature in database
GPG key ID: BE0423F386C436AA
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/widgets/index/Socials.astro
View file

@ -6,15 +6,9 @@ const socials = [
icon: "github.svg", icon: "github.svg",
}, },
{ {
<<<<<<< HEAD
name: "Discord",
link: "https://discord.com/invite/kFPKmEKeMS/",
icon: "discord",
=======
name: "Discord.svg", name: "Discord.svg",
link: "https://discord.gg/kFPKmEKeMS/", link: "https://discord.com/invite/kFPKmEKeMS/",
icon: "discord.svg", icon: "discord.svg",
>>>>>>> 4a6a93c20ea23162074d9884108d49fa12769f72
}, },
{ {
name: "Twitter", name: "Twitter",