Idea config changes
Idea config changes
Merge branch 'master' of https://github.com/simasaleksiejunas/zbump

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Merge branch 'master' of https://github.com/simasaleksiejunas/zbump
Merge branch 'master' of https://github.com/simasaleksiejunas/zbump
Removing some funny changes