From 6f7003c43e3b12aede3abe6756ce85c0a60351bc Mon Sep 17 00:00:00 2001
From: Lenoch <lenoch@mail.local>
Date: Sat, 28 Oct 2017 00:09:20 +0200
Subject: [PATCH] Pulled master to this branch

---
 .../src/main/java/cz/fi/muni/pa165/dao/CompetitionDao.java     | 2 +-
 .../src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java | 2 +-
 .../src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java      | 2 +-
 .../src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java  | 2 +-
 .../src/main/java/cz/fi/muni/pa165/entity/SportEvent.java      | 2 +-
 .../src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java   | 3 +++
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDao.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDao.java
index cb4816a..53f8e02 100644
--- a/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDao.java
+++ b/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDao.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová 26.10.17.
  */
 public interface CompetitionDao extends BaseDao<Competition> {
 
diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java
index 7446030..506837f 100644
--- a/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java
+++ b/persistence/src/main/java/cz/fi/muni/pa165/dao/CompetitionDaoImpl.java
@@ -6,7 +6,7 @@
 import java.util.List;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 @Repository
 public class CompetitionDaoImpl extends BaseDaoImpl<Competition> implements CompetitionDao{
diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java
index 7d13c92..dcf124f 100644
--- a/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java
+++ b/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDao.java
@@ -3,7 +3,7 @@
 import cz.fi.muni.pa165.entity.SportEvent;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 public interface SportEventDao extends BaseDao<SportEvent> {
 }
diff --git a/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java b/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java
index ccb4a4e..e2810cf 100644
--- a/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java
+++ b/persistence/src/main/java/cz/fi/muni/pa165/dao/SportEventDaoImpl.java
@@ -5,7 +5,7 @@
 import java.util.List;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 @Repository
 public class SportEventDaoImpl extends BaseDaoImpl<SportEvent> implements SportEventDao {
diff --git a/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java b/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java
index 1e9ff30..41c5d8d 100644
--- a/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java
+++ b/persistence/src/main/java/cz/fi/muni/pa165/entity/SportEvent.java
@@ -8,7 +8,7 @@
 import java.util.Set;
 
 /**
- * Created by lenoch on 26.10.17.
+ * @author Petra Halová on 26.10.17.
  */
 
 @Entity
diff --git a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java
index 663aa4d..a7cf791 100644
--- a/persistence/src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java
+++ b/persistence/src/test/java/cz/fi/muni/pa165/dao/SportDaoImplTest.java
@@ -1,5 +1,8 @@
 package cz.fi.muni.pa165.dao;
 
+/**
+ * @author Petra Halová
+ */
 public class SportDaoImplTest extends BaseDaoImplTest {
 
 }
\ No newline at end of file