Merge branch 'main' of https://github.com/ihedvall/report_server

# Conflicts:
#	README.md

Author: ihedvall

README.md

@@ -14,6 +14,7 @@ The project is a rather complex consisting of several libraries and applications
 - Application ODS Modeler. The application configure ASAM ODS database models.
 - Application Measurement Manager. The application manage multiple measurement files.
 
+<<<<<<< HEAD
 The project is currently under development.
 
 ## Building the project
@@ -32,4 +33,7 @@ the 'wxWidgets_ROOT_DIR' and the 'wxWidgets_LIB_DIR' variables.
 
 ## License
 
-The project uses the MIT license. See external LICENSE file in project root.
+The project uses the MIT license. See external LICENSE file in project root.
+=======
+The project is currently under development.
+>>>>>>> b0fb5db134066228124ebd128d6b768f26188a72