Merge branch '122-suppression-des-pi-plomes' of...

Merge branch '122-suppression-des-pi-plomes' of git.laquadrature.net:lqdn-interne/don into 122-suppression-des-pi-plomes

app/controller/admin.php

@@ -654,7 +654,11 @@ class Admin extends Controller
                     if ($pdf) {
                         $pdf = $pdf->fetch(\PDO::FETCH_ASSOC);
                     }
+<<<<<<< HEAD
                     $row['pdf_id'] =  $pdf['id'];
+=======
+                    $row['pdf_id'] = ''$pdf['id'];
+>>>>>>> 4b276960f6a651d6aa62eeacc7b19a7028be7ce4
                     $row['pdf_nom'] = $pdf['pseudo'];
                     $row['pdf_url'] = $pdf['pdf'];
                 } else {