Merge branch 'master' of C:\Users\Me\AndroidStudioProjects\MelounovyCukr with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	MelounovyCukr.iml
LAN tisk funkcni