From b20ea535eb59a6132c6b923b2d2684882ee4b9fd Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Sun, 28 Feb 2021 17:24:28 +0100
Subject: [PATCH] #14: Fixed merge conflict
---
client/package.json | 3 ---
client/src/App.tsx | 12 ------------
2 files changed, 15 deletions(-)
diff --git a/client/package.json b/client/package.json
index 2b67c103..4d2df9fc 100644
--- a/client/package.json
+++ b/client/package.json
@@ -4,10 +4,7 @@
"private": true,
"dependencies": {
"@material-ui/core": "^4.11.3",
-<<<<<<< HEAD
"@material-ui/icons": "^4.11.2",
-=======
->>>>>>> 186d707ace54d27ff8913eff2be29026e64afb43
"@material-ui/lab": "^4.0.0-alpha.57",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.5",
diff --git a/client/src/App.tsx b/client/src/App.tsx
index c26dce58..1e8c051e 100644
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@@ -9,19 +9,7 @@ const App: React.FC = () => {
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
/>
-<<<<<<< HEAD
<Main />
-=======
- <h1>Application</h1>
- <TestConnection />
- <BrowserRouter>
- <Switch>
- <Route path="/">
- <LoginForm />
- </Route>
- </Switch>
- </BrowserRouter>
->>>>>>> 186d707ace54d27ff8913eff2be29026e64afb43
</div>
)
}
--
GitLab