From 0f50f0eaf6a8671fe2418f4434438d4943f8e174 Mon Sep 17 00:00:00 2001 From: smarcet Date: Thu, 21 Feb 2019 12:33:25 -0300 Subject: [PATCH] Fixed merge conflict fixed merge conflict introduced by https://review.openstack.org/638437 Change-Id: Ic22de20113540ffff5865d99b04ff762208115ed --- .../Summit/DoctrineSpeakerRepository.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/Repositories/Summit/DoctrineSpeakerRepository.php b/app/Repositories/Summit/DoctrineSpeakerRepository.php index 6219b286..c6f6b7a4 100644 --- a/app/Repositories/Summit/DoctrineSpeakerRepository.php +++ b/app/Repositories/Summit/DoctrineSpeakerRepository.php @@ -77,7 +77,7 @@ FROM ( IFNULL(S.FirstName, M.FirstName) AS FirstName, IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email, R.Email) AS Email - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID WHERE @@ -93,7 +93,7 @@ FROM ( IFNULL(S.FirstName, M.FirstName) AS FirstName, IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email, R.Email) AS Email - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID WHERE @@ -109,7 +109,7 @@ FROM ( IFNULL(S.FirstName, M.FirstName) AS FirstName, IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email, R.Email) AS Email - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID WHERE @@ -173,7 +173,7 @@ FROM ( IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email,R.Email) AS Email, S.PhotoID - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN File F ON F.ID = S.PhotoID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID @@ -206,7 +206,7 @@ FROM ( IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email,R.Email) AS Email, S.PhotoID - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID WHERE @@ -238,7 +238,7 @@ FROM ( IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email,R.Email) AS Email, S.PhotoID - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID WHERE @@ -362,7 +362,7 @@ FROM ( IFNULL(S.FirstName, M.FirstName) AS FirstName, IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email,R.Email) AS Email - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID ) @@ -404,7 +404,7 @@ FROM ( IFNULL(S.LastName, M.Surname) AS LastName, IFNULL(M.Email,R.Email) AS Email, S.PhotoID - FROM Speaker S + FROM PresentationSpeaker S LEFT JOIN Member M ON M.ID = S.MemberID LEFT JOIN File F ON F.ID = S.PhotoID LEFT JOIN SpeakerRegistrationRequest R ON R.SpeakerID = S.ID