Fix conflict
This commit is contained in:
commit
c201b4f40f
2 files changed
+2
-2
No files matched your search
+1
-1
@@ -24,7 +24,7 @@
|
||||
"@advancedalgos/events-client": "^0.0.4",
|
||||
"@advancedalgos/key-vault-client": "^0.0.21",
|
||||
"@advancedalgos/teams-client": "^0.0.27",
|
||||
"@advancedalgos/users-client": "^0.0.19",
|
||||
"@advancedalgos/users-client": "^0.0.21",
|
||||
"@advancedalgos/web-components": "0.0.13",
|
||||
"@babel/core": "^7.1.2",
|
||||
"@babel/plugin-proposal-class-properties": "^7.1.0",
|
||||
|
||||
@@ -13,7 +13,7 @@ class Home extends Component {
|
||||
backgroundUrl='https://aacorporatesitedevelop.azurewebsites.net/img/photos/superalgos-platform.jpg'
|
||||
/>
|
||||
<div className='homePage'>
|
||||
<Typography variant='h1' align='center' className='title'>Welcome to the Superalgos Platform!</Typography>
|
||||
<Typography variant='h1' align='center' className='title'>Welcome to the Advanced Algos Platform!</Typography>
|
||||
<Typography variant='h2' align='center' className='subtitle'>CO-CREATE >> COMPETE >> EVOLVE</Typography>
|
||||
<div className='column'>
|
||||
<Typography align='justify'>
|
||||
|
||||
Reference in new issue
Block a user