mirror of
https://github.com/xHyroM/website.git
synced 2024-11-12 18:48:06 +01:00
fix: resolve conflicts
This commit is contained in:
parent
6155e58ed1
commit
9f0ce385f1
1 changed files with 1 additions and 7 deletions
|
@ -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",
|
||||||
|
|
Loading…
Reference in a new issue