Compare commits

..

No commits in common. "48e7463f11c31e34c8f1c5dde00c418ff43be3cb" and "a95413738bab20ff289e86f2930d7852e7a2962b" have entirely different histories.

View file

@ -106,6 +106,7 @@ NOT IN ( (SELECT idScientifique
FROM Encadrement) FROM Encadrement)
); );
<<<<<<< HEAD
-- Axel Q12 -- Axel Q12
SELECT idEnseignant FROM Enseignant_Chercheur ec SELECT idEnseignant FROM Enseignant_Chercheur ec
@ -120,7 +121,9 @@ WHERE pub.classeConf = 'A';
-- Yasmine QUESTION 14 -- Yasmine QUESTION 14
=======
-- Yasmine QUESTION 14 Testé -- Yasmine QUESTION 14 Testé
>>>>>>> af456634e468d2a6e5d3dbc4e169d73853af5baf
SELECT Count(Distinct idPublication) SELECT Count(Distinct idPublication)
FROM Publication FROM Publication