From 263cb088a1fcf84af7e11c8afa4a2e71e30700ba Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Mon, 28 Mar 2022 13:45:19 +0200
Subject: [PATCH] versie

---
 application/core/MY_Controller.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 9532022..b51025e 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -66,7 +66,14 @@ 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'; // 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;