Amir H. Moayeri AsbDaryaee

How to resolve package-lock.json conflicts

It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.

Update the master branch with the latest changes:
```
git checkout master
git pull
```
Merge your feature branch into master:

This file was generated automatically based on this two sources:

This is a JSON object by following structure:

[string ext] : {
 signs: [sign]

	// Usage:
	// Replace React.lazy(() => import('x'));
	// with retryDynamicImport(() => import('x'));

	import { ComponentType, lazy } from 'react';

	const MAX_RETRY_COUNT = 15;
	const RETRY_DELAY_MS = 500;

	// Regex to extract the module URL from the import statement

	<!doctype html>

	<!-- Adapted from https://gist.github.com/tfausak/2222823 -->

	<html>
	<head>
	<title>Mobile-ready web app</title>

	<!-- CONFIGURATION -->