Merge branch 'develop'

# Conflicts: # package-lock.json # package.json
2024-03-19 16:04:26 +01:00
parent 3f286ee042 ce52cbdbed
commit 7e17a49dc6
4 changed files with 8 additions and 2 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,10 @@
 {
  "name": "farmmaps-lib-app",
+<<<<<<< HEAD
  "version": "4.3.1",
+=======
+  "version": "4.4.0",
+>>>>>>> develop
  "scripts":   {
    "ng": "ng",
    "start": "ng serve",