paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 40 Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Marvin9
2020-10-11 19:19:35 +05:30
parent 6d68f6fec1 01830866e7
commit 6e3ba7c2c4
660 changed files with 11848 additions and 11656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/welcome/package.json
+5 -5
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-welcome",
"version": "0.1.1-alpha.23",
"version": "0.1.1-alpha.24",
"main": "src/index.ts",
"types": "src/index.ts",
"private": false,
@@ -21,8 +21,8 @@
"start": "backstage-cli plugin:serve"
},
"dependencies": {
"@backstage/core": "^0.1.1-alpha.23",
"@backstage/theme": "^0.1.1-alpha.23",
"@backstage/core": "^0.1.1-alpha.24",
"@backstage/theme": "^0.1.1-alpha.24",
"@material-ui/core": "^4.11.0",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "4.0.0-alpha.45",
@@ -32,8 +32,8 @@
"react-use": "^15.3.3"
},
"devDependencies": {
"@backstage/cli": "^0.1.1-alpha.23",
"@backstage/dev-utils": "^0.1.1-alpha.23",
"@backstage/cli": "^0.1.1-alpha.24",
"@backstage/dev-utils": "^0.1.1-alpha.24",
"@testing-library/jest-dom": "^5.10.1",
"@testing-library/react": "^10.4.1",
"@testing-library/user-event": "^12.0.7",
plugins/welcome/src/components/WelcomePage/WelcomePage.tsx
+16 -4
View File
@@ -75,7 +75,10 @@ const WelcomePage = () => {
the project and we have already begun work on various aspects
of these phases. The best way to keep track of the progress is
through the 
<Link href="https://github.com/spotify/backstage/milestones">
<Link
href="https://github.com/spotify/backstage/milestones"
rel="noopener noreferrer"
>
Milestones
</Link>
.
@@ -119,7 +122,10 @@ const WelcomePage = () => {
</Typography>
<Typography variant="body1" paragraph>
We suggest you either check out the documentation for{' '}
<Link href="https://github.com/spotify/backstage/blob/master/docs/plugins/create-a-plugin.md">
<Link
href="https://github.com/spotify/backstage/blob/master/docs/plugins/create-a-plugin.md"
rel="noopener noreferrer"
>
creating a plugin
</Link>{' '}
or have a look in the code for the{' '}
@@ -127,7 +133,10 @@ const WelcomePage = () => {
existing plugins
</Link>{' '}
in the directory{' '}
<Link href="https://github.com/spotify/backstage/tree/master/plugins">
<Link
href="https://github.com/spotify/backstage/tree/master/plugins"
rel="noopener noreferrer"
>
<code>plugins/</code>
</Link>
.
@@ -141,7 +150,10 @@ const WelcomePage = () => {
<Link href="https://backstage.io">backstage.io</Link>
</ListItem>
<ListItem>
<Link href="https://github.com/spotify/backstage/blob/master/docs/plugins/create-a-plugin.md">
<Link
href="https://github.com/spotify/backstage/blob/master/docs/plugins/create-a-plugin.md"
rel="noopener noreferrer"
>
Create a plugin
</Link>
</ListItem>