IU-2021.1.3 <wangwei-202@KANE_DELL5050 Merge branch 'master'
This commit is contained in:
		@@ -1,6 +1,6 @@
 | 
			
		||||
<application>
 | 
			
		||||
  <component name="PathMacrosImpl">
 | 
			
		||||
    <macro name="MAVEN_REPOSITORY" value="C:\Users\wangk\.m2\repository" />
 | 
			
		||||
    <macro name="KOTLIN_BUNDLED" value="C:\Users\wangk\AppData\Roaming\JetBrains\IntelliJIdea2021.1\plugins\Kotlin\kotlinc" />
 | 
			
		||||
    <macro name="KOTLIN_BUNDLED" value="C:\Program Files\JetBrains\IntelliJ IDEA 2021.1.2\plugins\Kotlin\kotlinc" />
 | 
			
		||||
  </component>
 | 
			
		||||
</application>
 | 
			
		||||
@@ -159,7 +159,7 @@
 | 
			
		||||
                  </entry>
 | 
			
		||||
                  <entry key="JetRunConfigurationType">
 | 
			
		||||
                    <value>
 | 
			
		||||
                      <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
 | 
			
		||||
                      <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
 | 
			
		||||
                    </value>
 | 
			
		||||
                  </entry>
 | 
			
		||||
                  <entry key="JettyConfiguration">
 | 
			
		||||
@@ -169,12 +169,12 @@
 | 
			
		||||
                  </entry>
 | 
			
		||||
                  <entry key="KotlinJavaScriptTestRunnerProtractor">
 | 
			
		||||
                    <value>
 | 
			
		||||
                      <FeaturePluginData displayName="Protractor (Kotlin)" pluginName="org.jetbrains.kotlin" pluginId="org.jetbrains.kotlin" />
 | 
			
		||||
                      <FeaturePluginData displayName="Protractor (Kotlin)" pluginName="org.jetbrains.kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
 | 
			
		||||
                    </value>
 | 
			
		||||
                  </entry>
 | 
			
		||||
                  <entry key="KotlinStandaloneScriptRunConfigurationType">
 | 
			
		||||
                    <value>
 | 
			
		||||
                      <FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
 | 
			
		||||
                      <FeaturePluginData displayName="Kotlin script" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
 | 
			
		||||
                    </value>
 | 
			
		||||
                  </entry>
 | 
			
		||||
                  <entry key="MavenRunConfiguration">
 | 
			
		||||
@@ -364,7 +364,7 @@
 | 
			
		||||
                  </entry>
 | 
			
		||||
                  <entry key="kotlin-language">
 | 
			
		||||
                    <value>
 | 
			
		||||
                      <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" />
 | 
			
		||||
                      <FeaturePluginData displayName="Kotlin" pluginName="Kotlin" pluginId="org.jetbrains.kotlin" bundled="true" />
 | 
			
		||||
                    </value>
 | 
			
		||||
                  </entry>
 | 
			
		||||
                  <entry key="native-android-gradle">
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user