From c01ac11798f3267789f98a1b21ee45fd55a6581e Mon Sep 17 00:00:00 2001
From: rlacko <rlacko@sch.bme.hu>
Date: Sun, 2 Feb 2020 23:45:41 +0100
Subject: [PATCH] merge fix
---
src/components/App.js | 1 +
src/components/Header.js | 2 +-
src/components/forms/SolutionDetailsForm.js | 2 +-
src/components/pages/Groups.js | 3 +--
src/components/pages/News.js | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/App.js b/src/components/App.js
index 0661e3e..bf61f96 100644
--- a/src/components/App.js
+++ b/src/components/App.js
@@ -4,6 +4,7 @@ import Main from './Main';
import Footer from './Footer';
+
const App = () => (
<div style={{ minHeight: '100%', position: 'relative' }}>
<header id='header' >
diff --git a/src/components/Header.js b/src/components/Header.js
index 9d5370e..3fa0d27 100644
--- a/src/components/Header.js
+++ b/src/components/Header.js
@@ -201,4 +201,4 @@ const mapStateToProps = ({ user }) => ({
user,
});
-export default connect(mapStateToProps, { getUserData })(Header);
+export default connect(mapStateToProps, { getUserData })(Header);
\ No newline at end of file
diff --git a/src/components/forms/SolutionDetailsForm.js b/src/components/forms/SolutionDetailsForm.js
index d3ecf23..b7ab9b7 100644
--- a/src/components/forms/SolutionDetailsForm.js
+++ b/src/components/forms/SolutionDetailsForm.js
@@ -147,4 +147,4 @@ const mapStateToProps = ({ homeworks, user }) => ({ homeworks, user });
export default connect(mapStateToProps, {
getSolutions, getDocuments,
-})(SolutionDetailsForm);
+})(SolutionDetailsForm);
\ No newline at end of file
diff --git a/src/components/pages/Groups.js b/src/components/pages/Groups.js
index f1251d1..da6dc34 100644
--- a/src/components/pages/Groups.js
+++ b/src/components/pages/Groups.js
@@ -1,5 +1,5 @@
import React, { Component } from 'react';
-import { Container, Header, Segment, Divider } from 'semantic-ui-react';
+import { Container, Header, Segment } from 'semantic-ui-react';
import './Groups.css';
import GroupCard from '../extra/GroupCard'
@@ -46,4 +46,3 @@ class Groups extends Component {
const mapStateToProps = ({ groups }) => ({ groups });
export default connect(mapStateToProps, { getGroups })(Groups);
-
diff --git a/src/components/pages/News.js b/src/components/pages/News.js
index 11804cf..02e1f56 100644
--- a/src/components/pages/News.js
+++ b/src/components/pages/News.js
@@ -96,4 +96,4 @@ class News extends Component {
const mapStateToProps = ({ news, user }) => ({ news, user });
-export default connect(mapStateToProps, { getNews, deleteNews, setSelectedNews })(News);
+export default connect(mapStateToProps, { getNews, deleteNews, setSelectedNews })(News);
\ No newline at end of file
--
GitLab