nieuwe poging

2022-01-25 09:28:50 +01:00
parent 273305be2c
commit 3ae6d69187
1 changed files with 3 additions and 3 deletions
@@ -23,9 +23,9 @@ class  Pdfmaker extends MY_Controller{
        $inputstring	= $this->input->post('data');
        $input			= json_decode($inputstring);
        $inhoud         = $input->pagina;
-<<<<<<< HEAD
+
        $titel          = $input->titel;
-=======
+
        $schooljaar     = $input->titel;
        $orgsoort       = $input->orgsoort;
        //maak goede titel
@@ -39,7 +39,7 @@ class  Pdfmaker extends MY_Controller{
            default : $profiel = 'SOP';
        }
        $soptitel = 'Compact '.$profiel. ' ' . $schooljaar;
->>>>>>> zarchief/headersop
+
        $schoolid       = $input->schoolid;
        $schooljaarnummer   = $input->schooljaarnr;
        $organisatie        = $this->Organisaties_model->get(['id' => $schoolid],false, true);