?? strange commmit
how to merge with GitHub version conflict?
from SmartGit
commit and try to push
try 2
new feature file.txt from feature branch
Merge branch 'preMaster' into hhh

Conflicts:
	HelloWorldExample/pr/.idea/vcs.xml
	HelloWorldExample/pr/.idea/workspace.xml
	HelloWorldExample/pr/out/production/pr/.idea/uiDesigner.xml
	HelloWorldExample/pr/testmain.java