Updated package.json + fixed en.json

Author: nicola74

package-lock.json

@@ -56,7 +56,7 @@
     "humanize-duration": "^3.18.0",
     "humanize-duration-ts": "^2.0.0",
     "jquery": "3.2.1",
-    "leaflet": "1.5.1",
+    "leaflet": "^1.5.1",
     "moment": "^2.18.1",
     "moment-timezone": "^0.5.21",
     "mydatepicker": "^2.6.5",

package.json

@@ -1586,7 +1586,6 @@
     "ResetFilters": "Reset filters",
     "AppliedFilters": "Applied Filters",
     "Ticket": "Internal request",
-<<<<<<< HEAD
     "EnableDisable": "Enable / disable",
     "SoundEnabled": "Sound enabled",
     "SoundDisabled": "Sound disabled",
@@ -1614,35 +1613,4 @@
     "OnlineOfflineGreetings": "Online / Offline Greetings",
     "WidgetPreviewIsDisplayedIn": "Widget preview is currently displayed in",
     "ChangePreviewToCustomizeTheFollowingFieldsInAnotherLanguage": "Change preview in the Multilanguage section to customize the following fields in another language"
-=======
-    "EnableDisable":"Enable / disable",
-    "Webhook": {
-        "AddSubscription": "Add Subscription",
-        "Subscriptions": "Subscriptions",
-        "Actions": "Actions",
-        "NoWebhookSubscriptions": "There are no webhook subscriptions",
-        "CreateSubscription": "Create subscription",
-        "UpdateSubscription": "Update sottoscrizione",
-        "RequiredFiled": "*Required field",
-        "SelectEvent": "Select event",
-        "SharedSecretGenerated": "Shared Secret Generated",
-        "ThisIsYourSharedSecret": "This is your shared secret",
-        "Copy": "Copy",
-        "NoteThatWillBeDisplayedOnce": "Note that this shared secret will only be displayed once",
-        "ConfirmSubscriptionDeleteTitle": "Delete Subscription",
-        "ConfirmSubscriptionDeleteBody" : "Are you sure you want to unsubscribe? This action is irreversible.",
-        "ConfirmButton": "Confirm",
-        "CancelButton": "Cancel",
-        "MoreInfoWebhook": "For more information about Webhook please visit ",
-        "NotificationMsgs": {
-            "DeleteSubscriptionError": "An error occurred while deleting subscription",
-            "DeleteSubscriptionSuccess": "Subscription successfully deleted",
-            "CreateSubscriptionSuccess": "Subscription successfully created",
-            "CreateSubscriptionError": "An error occurred while creating subscription",
-            "UpdateSubscriptionSuccess": "Subscription successfully updated",
-            "UpdateSubscriptionError": "An error occurred while updating subscription",
-            "ShowSecretError": "An error occurred while secret generation"
-        }
-    }
->>>>>>> new_features_dev
 }