Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9438b6c7 authored by AVINASH GUSAIN's avatar AVINASH GUSAIN
Browse files

conflict resolved

parents 2c3f4e0a 253f784e
Loading
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -14355,6 +14355,16 @@
				"node": ">= 0.8"
			}
		},
		"node_modules/send/node_modules/depd": {
			"version": "2.0.0",
			"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
			"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
			"dev": true,
			"peer": true,
			"engines": {
				"node": ">= 0.8"
			}
		},
		"node_modules/send/node_modules/ms": {
			"version": "2.1.3",
			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",