diff --git a/package.json b/package.json index e956d8f..241df04 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,6 @@ { "name": "farmmaps-lib-app", -<<<<<<< HEAD - "version": "4.3.1", -======= "version": "4.4.0", ->>>>>>> develop "scripts": { "ng": "ng", "start": "ng serve",