IU-2019.1.1 <aiko@Lindas-MacBook-Pro.local Merge branch 'master'
Conflicts: ide.general.xml markdown.xml
This commit is contained in:
commit
76735cd3ba
@ -1,5 +1,5 @@
|
||||
<application>
|
||||
<component name="LafManager">
|
||||
<laf class-name="com.intellij.ide.ui.laf.IntelliJLaf" />
|
||||
<laf class-name="com.intellij.ide.ui.laf.darcula.DarculaLaf" />
|
||||
</component>
|
||||
</application>
|
||||
5
colors.scheme.xml
Normal file
5
colors.scheme.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<application>
|
||||
<component name="EditorColorsManagerImpl">
|
||||
<global_color_scheme name="Darcula" />
|
||||
</component>
|
||||
</application>
|
||||
8
ide.general.xml
Normal file
8
ide.general.xml
Normal file
@ -0,0 +1,8 @@
|
||||
<application>
|
||||
<component name="GeneralSettings">
|
||||
<option name="showTipsOnStartup" value="false" />
|
||||
</component>
|
||||
<component name="Registry">
|
||||
<entry key="ide.mac.allowDarkWindowDecorations" value="true" />
|
||||
</component>
|
||||
</application>
|
||||
@ -1,55 +0,0 @@
|
||||
<application>
|
||||
<component name="ProjectJdkTable">
|
||||
<jdk version="2">
|
||||
<name value="1.8" />
|
||||
<type value="JavaSDK" />
|
||||
<version value="1.8" />
|
||||
<homePath value="/Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home" />
|
||||
<roots>
|
||||
<annotationsPath>
|
||||
<root type="composite" />
|
||||
</annotationsPath>
|
||||
<classPath>
|
||||
<root type="composite">
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/charsets.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/deploy.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/cldrdata.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/dnsns.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/jfxrt.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/localedata.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/nashorn.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/sunec.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/sunjce_provider.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/sunpkcs11.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/ext/zipfs.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/javaws.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/jce.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/jfr.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/jfxswt.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/jsse.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/management-agent.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/plugin.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/resources.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/jre/lib/rt.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/lib/ant-javafx.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/lib/dt.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/lib/javafx-mx.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/lib/jconsole.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/lib/sa-jdi.jar!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/lib/tools.jar!/" type="simple" />
|
||||
</root>
|
||||
</classPath>
|
||||
<javadocPath>
|
||||
<root type="composite" />
|
||||
</javadocPath>
|
||||
<sourcePath>
|
||||
<root type="composite">
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/src.zip!/" type="simple" />
|
||||
<root url="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_31.jdk/Contents/Home/javafx-src.zip!/" type="simple" />
|
||||
</root>
|
||||
</sourcePath>
|
||||
</roots>
|
||||
<additional />
|
||||
</jdk>
|
||||
</component>
|
||||
</application>
|
||||
6
markdown.xml
Normal file
6
markdown.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<application>
|
||||
<component name="MarkdownApplicationSettings">
|
||||
<MarkdownCssSettings StylesheetUri="jar:file:/Users/aiko/Library/Application%20Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/191.6707.61/IntelliJ%20IDEA.app/Contents/plugins/markdown/lib/markdown.jar!/org/intellij/plugins/markdown/settings/darcula.css" />
|
||||
<MarkdownPreviewSettings DefaultSplitLayout="Show editor only" />
|
||||
</component>
|
||||
</application>
|
||||
18
updates.xml
18
updates.xml
@ -1,18 +0,0 @@
|
||||
<application>
|
||||
<component name="UpdatesConfigurable">
|
||||
<enabledExternalComponentSources>
|
||||
<item value="Android SDK" />
|
||||
</enabledExternalComponentSources>
|
||||
<option name="externalUpdateChannels">
|
||||
<map>
|
||||
<entry key="Android SDK" value="Stable Channel" />
|
||||
</map>
|
||||
</option>
|
||||
<knownExternalComponentSources>
|
||||
<item value="Android SDK" />
|
||||
</knownExternalComponentSources>
|
||||
<option name="LAST_BUILD_CHECKED" value="IU-191.6707.61" />
|
||||
<option name="LAST_TIME_CHECKED" value="1555956484562" />
|
||||
<option name="THIRD_PARTY_PLUGINS_ALLOWED" value="true" />
|
||||
</component>
|
||||
</application>
|
||||
Loading…
x
Reference in New Issue
Block a user