In Intellij project, set source control to git, not perforce.
In Intellij project, set source control to git, not perforce.

Conflicts:

	intellij/mondrian.ipr

citycloud-bigdata/mondrian,citycloud-bigdata/mondrian,citycloud-bigdata/mondrian