Delete vcs.xml
Delete profiles_settings.xml
Delete mysql_connector_java_5_1_34_bin.xml
Delete scope_settings.xml
Delete compiler.xml
Delete description.html
Delete encodings.xml
Delete misc.xml
Delete modules.xml
Delete SQL.iml
новый коммит
Merge remote-tracking branch 'origin/master'