Skip to content

Commit

Permalink
resolved conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
clevercoderjoy committed Feb 16, 2024
2 parents 6aa3d65 + bd630a4 commit decbfdb
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
"workbox-precaching": "^7.0.0",
"workbox-routing": "^7.0.0",
"workbox-strategies": "^7.0.0",
"workbox-window": "^7.0.0"
"workbox-window": "^7.0.0",
"yarn": "^1.22.21"
},
"scripts": {
"dev": "react-scripts start",
Expand Down
10 changes: 10 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions src/common/footer/ExtendedFooter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import { useSearchContext } from 'common/search/search-context';
import { CREATE_PLAY_DOC_LINK } from 'constants';
import LogoLight from 'images/img-logo-light.svg';
import { BsGithub } from 'react-icons/bs';
import { FaDiscord, FaLinkedin } from 'react-icons/fa';
import { FaInstagram, FaMeetup, FaXTwitter } from 'react-icons/fa6';
import { FaDiscord, FaEnvelope, FaLinkedin } from 'react-icons/fa';
import { FaInstagram, FaXTwitter } from 'react-icons/fa6';
import { IoAddSharp, IoLogoRss } from 'react-icons/io5';
import { MdManageSearch } from 'react-icons/md';
import { Link } from 'react-router-dom';
Expand Down Expand Up @@ -36,10 +36,10 @@ const ExtendedFooter = () => {
title: 'Blog Page'
},
{
name: 'Meetup',
url: 'https://www.meetup.com/reactplay-bengaluru/',
icon: <FaMeetup className="icon" />,
title: 'Meetup Page'
name: 'Email',
url: 'mailto:contact@reactplay.io',
icon: <FaEnvelope className="icon" />,
title: 'Email'
},
{
name: 'Linkedin',
Expand Down

0 comments on commit decbfdb

Please sign in to comment.