Fix merge conflicts

This commit is contained in:
Marcus Eide
2020-09-29 09:26:57 +02:00
parent 790cd5ac49
commit d33fa314cd
8 changed files with 80 additions and 234 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "@backstage/plugin-user-settings",
"version": "0.1.1-alpha.21",
"version": "0.1.1-alpha.23",
"main": "src/index.ts",
"types": "src/index.ts",
"license": "Apache-2.0",