From c73618c4c1e4caede04f3f7663f76939385bda98 Mon Sep 17 00:00:00 2001
From: ebarrios <esteban.barrios@trivago.com>
Date: Fri, 4 Sep 2020 10:17:56 +0200
Subject: [PATCH] Fixed old merge conflict in api.ts and cange to Table element
 in ProjectDetailsPage.tsx

---
 packages/app/src/apis.ts                      |  2 --
 .../ProjectDetailsPage/ProjectDetailsPage.tsx |  4 ++--
 yarn.lock                                     | 24 ++-----------------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/packages/app/src/apis.ts b/packages/app/src/apis.ts
index ace4ea16a2..b391e95d62 100644
--- a/packages/app/src/apis.ts
+++ b/packages/app/src/apis.ts
@@ -84,7 +84,6 @@ import {
   githubPullRequestsApiRef,
 } from '@roadiehq/backstage-plugin-github-pull-requests';
 
-
 export const apis = (config: ConfigApi) => {
   // eslint-disable-next-line no-console
   console.log(`Creating APIs for ${config.getString('app.title')}`);
@@ -105,7 +104,6 @@ export const apis = (config: ConfigApi) => {
   );
 
   builder.add(storageApiRef, WebStorage.create({ errorApi }));
-  builder.add(circleCIApiRef, new CircleCIApi());
   builder.add(GCPApiRef, new GCPClient());
   builder.add(
     circleCIApiRef,
diff --git a/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx b/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx
index 713918d8a2..57f1806973 100644
--- a/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx
+++ b/plugins/gcp-projects/src/components/ProjectDetailsPage/ProjectDetailsPage.tsx
@@ -86,7 +86,7 @@ const DetailsPage = () => {
   const details = status.value;
 
   return (
-    <TableContainer component={Paper} className={classes.table}>
+    <Table component={Paper} className={classes.table}>
       <Table>
         <TableBody>
           <TableRow>
@@ -144,7 +144,7 @@ const DetailsPage = () => {
           </TableRow>
         </TableBody>
       </Table>
-    </TableContainer>
+    </Table>
   );
 };
 
diff --git a/yarn.lock b/yarn.lock
index 2840e9d7a5..9175c61e60 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -18844,7 +18844,7 @@ react-transition-group@^4.0.0, react-transition-group@^4.3.0:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-universal-interface@^0.6.0, react-universal-interface@^0.6.2:
+react-universal-interface@^0.6.2:
   version "0.6.2"
   resolved "https://registry.npmjs.org/react-universal-interface/-/react-universal-interface-0.6.2.tgz#5e8d438a01729a4dbbcbeeceb0b86be146fe2b3b"
   integrity sha512-dg8yXdcQmvgR13RIlZbTRQOoUrDciFVoSBZILwjE2LFISxZZ8loVJKAkuzswl5js8BHda79bIb2b84ehU8IjXw==
@@ -18866,26 +18866,6 @@ react-use@^12.2.0:
     ts-easing "^0.2.0"
     tslib "^1.10.0"
 
-react-use@^14.2.0:
-  version "14.3.0"
-  resolved "https://registry.npmjs.org/react-use/-/react-use-14.3.0.tgz#aa794db42108e15363be5c04db35a57acf8ecb6b"
-  integrity sha512-Jx7Zl0k8dHA0UKpTVwYUThC5/V+Dt6JzCGiMHPNIhsxJGkiKuB1AQ7J7pNq4zj3l37ABd/RF+jRGThw0czrJXA==
-  dependencies:
-    "@types/js-cookie" "2.2.6"
-    "@xobotyi/scrollbar-width" "1.9.5"
-    copy-to-clipboard "^3.2.0"
-    fast-deep-equal "^3.1.1"
-    fast-shallow-equal "^1.0.0"
-    js-cookie "^2.2.1"
-    nano-css "^5.2.1"
-    react-universal-interface "^0.6.0"
-    resize-observer-polyfill "^1.5.1"
-    screenfull "^5.0.0"
-    set-harmonic-interval "^1.0.1"
-    throttle-debounce "^2.1.0"
-    ts-easing "^0.2.0"
-    tslib "^1.10.0"
-
 react-use@^15.3.3:
   version "15.3.3"
   resolved "https://registry.npmjs.org/react-use/-/react-use-15.3.3.tgz#f16de7a16286c446388e8bd99680952fc3dc9a95"
@@ -21882,7 +21862,7 @@ ts-loader@^7.0.4:
     micromatch "^4.0.0"
     semver "^6.0.0"
 
-ts-node@^8.10.2, ts-node@^8.6.2:
+ts-node@^8.6.2:
   version "8.10.2"
   resolved "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"
   integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==