Skip to content

Commit e7edbfc

Browse files
committed
resolve conflict
1 parent e20319d commit e7edbfc

1 file changed

Lines changed: 0 additions & 6 deletions

File tree

src/components/SocialBanner.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,9 @@ import {useRef, useEffect} from 'react';
77
import cn from 'classnames';
88
import {ExternalLink} from './ExternalLink';
99

10-
<<<<<<< HEAD
11-
const bannerText = 'Украинаны қолдаңыз 🇺🇦';
12-
const bannerLink = 'https://opensource.fb.com/support-ukraine';
13-
const bannerLinkText = 'Украинаға гуманитарлық көмек көрсетуге көмектесіңіз';
14-
=======
1510
const bannerText = 'Stream React Conf on May 15-16.';
1611
const bannerLink = 'https://conf.react.dev/';
1712
const bannerLinkText = 'Learn more.';
18-
>>>>>>> c3bc5affa0e7452e306c785af11798d16b4f6dd4
1913

2014
export default function SocialBanner() {
2115
const ref = useRef<HTMLDivElement | null>(null);

0 commit comments

Comments
 (0)