From b80ceeb342dd8dd14a5ca2a2a7ed1a8846a9fb6c Mon Sep 17 00:00:00 2001 From: Monique Date: Mon, 28 Mar 2022 13:50:11 +0200 Subject: [PATCH] versie --- application/core/MY_Controller.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index b51025e..7734e7a 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -66,14 +66,10 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.89'; // printformulier // public $version = '1.17.90'; // sops ordenen per eigen criterium // public $version = '1.17.91'; // grafieken in 3d -<<<<<<< HEAD - public $version = '1.17.92'; // 2 nieuwe onderdelen in Compact Sop -======= +// public $version = '1.17.92'; // 2 nieuwe onderdelen in Compact Sop // public $version = '1.17.92'; // Scan en Verbeteraanpak Pa.O.in Compact Sop // public $version = '1.17.93';// stuur bijlage bij new wachtwoord public $version = '1.17.94';// verbeteringen invullijst, fout omvang - ->>>>>>> fouten/chartomvang&layoutlijst&flexibel public $partituurid; public $globProfielVersieID = 1;