IU-2021.1.2 <Kane@Kane-7400 Merge branch 'master'
Conflicts: _windows/path.macros.xml
This commit is contained in:
commit
b6d2409771
@ -1,6 +1,6 @@
|
|||||||
<application>
|
<application>
|
||||||
<component name="PathMacrosImpl">
|
<component name="PathMacrosImpl">
|
||||||
<macro name="MAVEN_REPOSITORY" value="C:\Users\wangk\.m2\repository" />
|
<macro name="MAVEN_REPOSITORY" value="C:\Users\wangk\.m2\repository" />
|
||||||
<macro name="KOTLIN_BUNDLED" value="C:\Users\Kane\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\Kotlin\kotlinc" />
|
<macro name="KOTLIN_BUNDLED" value="C:\Users\wangk\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\Kotlin\kotlinc" />
|
||||||
</component>
|
</component>
|
||||||
</application>
|
</application>
|
28
webDeployTransportHostTargets.xml
Normal file
28
webDeployTransportHostTargets.xml
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
<application>
|
||||||
|
<component name="WebDeploymentTransportHostTargets">
|
||||||
|
<option name="stateHostTargets">
|
||||||
|
<list>
|
||||||
|
<WebDeploymentTransportHostTarget>
|
||||||
|
<option name="hostId" value="9fc6d3eb-ed90-4e8d-af0c-cdf953dc25c9" />
|
||||||
|
<option name="target">
|
||||||
|
<TransportTarget>
|
||||||
|
<option name="id" value="003fc196-8c66-4a21-89dd-05a1e3df7d67" />
|
||||||
|
<id>003fc196-8c66-4a21-89dd-05a1e3df7d67</id>
|
||||||
|
</TransportTarget>
|
||||||
|
</option>
|
||||||
|
<option name="targetPath" value="" />
|
||||||
|
</WebDeploymentTransportHostTarget>
|
||||||
|
<WebDeploymentTransportHostTarget>
|
||||||
|
<option name="hostId" value="9fc6d3eb-ed90-4e8d-af0c-cdf953dc25c9" />
|
||||||
|
<option name="target">
|
||||||
|
<TransportTarget>
|
||||||
|
<option name="id" value="9fbc4445-a879-4bb9-a3c4-5abc2cfb4dee" />
|
||||||
|
<id>9fbc4445-a879-4bb9-a3c4-5abc2cfb4dee</id>
|
||||||
|
</TransportTarget>
|
||||||
|
</option>
|
||||||
|
<option name="targetPath" value="" />
|
||||||
|
</WebDeploymentTransportHostTarget>
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</application>
|
Loading…
x
Reference in New Issue
Block a user