# Conflicts:
#	RELEASE.md
#	package-lock.json
#	package.json
#	src/background.js
#	src/era/model/era-class.js
#	src/era/tools/generate-static-data.js

resolves !3

# Conflicts:
#	RELEASE.md
#	example
#	src/era/model/era-class.js
#	src/era/tools/generate-static-data.js
#	src/js/components/config-dialog.vue
#	src/renderer/utils/value-utils.js

# Conflicts:
#	src/era/model/era-class.js

# Conflicts:
#	RELEASE.md
#	package-lock.json
#	src/era/const.js
#	src/era/model/era-api.js
#	src/era/model/era-class.js

# Conflicts:
#	RELEASE.md
#	src/era/model/era-class.js
#	src/era/name-mapping.json
#	src/js/app.vue

# Conflicts:
#	src/era/model/era-class.js
#	src/js/components/config-dialog.vue

# Conflicts:
#	src/background.js
#	src/era/model/era-class.js
#	src/era/name-mapping.json

closes #1