conflicts fixes

reactjs · May 17, 2019 · 7325a43 · 7325a43
1 parent aaef873
commit 7325a43
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/pages/index.js b/src/pages/index.js
@@ -50,13 +50,8 @@ class Home extends Component {
     return (
       <Layout location={location}>
         <TitleAndMetaTags
-<<<<<<< HEAD
           title="React &ndash; युज़र इंटरफ़ेसिज़ के निर्माण के लिए एक जावास्क्रिप्ट लाइब्रेरी"
-          ogUrl={createOgUrl('index.html')}
-=======
-          title="React &ndash; A JavaScript library for building user interfaces"
           canonicalUrl={createCanonicalUrl('/')}
->>>>>>> 06deefa56756f8dac13af59ee657186a81d28151
         />
         <div css={{width: '100%'}}>
           <header