From ab1efb62052b32d04adf552686532f8f7010a217 Mon Sep 17 00:00:00 2001
From: fmazzini <fmazzini@unibz.it>
Date: Wed, 5 May 2021 18:38:17 +0200
Subject: [PATCH] Adjust Mergin
---
src/App.tsx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/App.tsx b/src/App.tsx
index 5fc532e..82f532d 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,5 +1,4 @@
-
-import React, { FC } from 'react'
+import React, { FC } from 'react';
import { createMuiTheme, ThemeProvider } from '@material-ui/core/styles';
import { BrowserRouter as Router, Switch, Route } from 'react-router-dom';
import { HomePage } from 'components/HomePage/HomePage';
@@ -11,7 +10,6 @@ import { NotFound } from 'components/NotFound/NotFound';
import { ProfilePage } from 'components/ProfilePage/ProfilePage';
import { Roles } from 'components/api/userRoles';
import { Unauthorized } from 'components/Unauthorized/Unauthorized';
-<<<<<<< HEAD
const theme = createMuiTheme({
palette: {
@@ -41,9 +39,6 @@ const theme = createMuiTheme({
},
});
-=======
->>>>>>> 3963f9e8e52654a642bfec3c827f06db43ef8d29
-
export const App: FC = () => (
<Router>
<div data-testid="App">
--
GitLab