IU-2020.2 <aiko@Lindas-MacBook-Pro.local Merge branch 'master'

Conflicts:
	databaseDrivers.xml
	filetypes.xml
This commit is contained in:
Aiko Mastboom 2020-09-07 19:53:58 +02:00
commit 0a524df092
10 changed files with 79 additions and 5 deletions

5
_mac/git.xml Normal file
View File

@ -0,0 +1,5 @@
<application>
<component name="Git.Application.Settings">
<option name="USE_CREDENTIAL_HELPER" value="true" />
</component>
</application>

View File

@ -1,7 +1,7 @@
<application>
<component name="PathMacrosImpl">
<macro name="MAVEN_REPOSITORY" value="/Users/aiko/.m2/repository" />
<macro name="KOTLIN_BUNDLED" value="/Users/aiko/Library/Application Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/193.6015.39/IntelliJ IDEA.app/Contents/plugins/Kotlin/kotlinc" />
<macro name="KOTLIN_BUNDLED" value="/Users/aiko/Library/Application Support/JetBrains/Toolbox/apps/IDEA-U/ch-0/201.7846.76/IntelliJ IDEA.app.plugins/Kotlin/kotlinc" />
<ignoredMacro name="MESSAGE" />
<ignoredMacro name="FILE_PATH" />
<ignoredMacro name="LINE" />

View File

@ -75,6 +75,41 @@
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
<filter>
<option name="PATTERN" value="kotlin.*" />
<option name="ENABLED" value="true" />
<option name="INCLUDE" value="true" />
</filter>
</component>
<component name="XDebuggerSettings">
<data-views />

View File

@ -6,6 +6,11 @@
<option name="IGNORE_POLICY" value="IGNORE_WHITESPACES" />
</PlaceSettings>
</entry>
<entry key="ChangesView">
<PlaceSettings>
<option name="EXPAND_BY_DEFAULT" value="false" />
</PlaceSettings>
</entry>
</option>
</component>
</application>

View File

@ -5,15 +5,15 @@
<removed_mapping ext="bat" approved="true" type="PLAIN_TEXT" />
<removed_mapping ext="log" approved="true" type="PLAIN_TEXT" />
<removed_mapping ext="cmd" approved="true" type="PLAIN_TEXT" />
<mapping pattern="setenv" type="Shell Script" />
<mapping pattern="setenv*" type="Shell Script" />
<mapping pattern="elixir" type="Shell Script" />
<removed_mapping ext="bat" approved="true" type="PLAIN_TEXT" />
<removed_mapping ext="log" approved="true" type="PLAIN_TEXT" />
<removed_mapping ext="dockerfile" approved="true" type="textmate" />
<removed_mapping ext="makefile" approved="true" type="textmate" />
<removed_mapping pattern="setenv" approved="true" type="PLAIN_TEXT" />
<removed_mapping pattern="setenv" approved="true" type="JSHELL" />
<removed_mapping ext="cmd" approved="true" type="PLAIN_TEXT" />
<removed_mapping ext="snakefile" approved="true" type="textmate" />
<mapping pattern="setenv" type="Bash" />
</extensionMap>
</component>
</application>

View File

@ -3,7 +3,16 @@
<option name="customScope" value="All Places" />
<option name="defaultScopeName" value="All Places" />
<option name="localCaseSensitive" value="true" />
<option name="showResultsInSeparateView" value="true" />
<option name="LOCAL_CASE_SENSITIVE_SEARCH" value="true" />
<option name="SHOW_RESULTS_IN_SEPARATE_VIEW" value="true" />
<option name="SEARCH_SCOPE" value="All Places" />
<mask>*.css</mask>
<mask>*.html</mask>
<mask>*.xml</mask>
<mask>*.jsp</mask>
<mask>*.properties</mask>
<mask>*.java</mask>
<mask>*.js</mask>
</component>
</application>

7
github.xml Normal file
View File

@ -0,0 +1,7 @@
<application>
<component name="GithubAccounts">
<account id="15f3c556-44a0-4bfb-b6b0-891af39f4551" name="aikomastboom">
<server host="github.com" />
</account>
</component>
</application>

View File

@ -4,6 +4,12 @@
</component>
<component name="Registry">
<entry key="ide.mac.allowDarkWindowDecorations" value="true" />
<entry key="git.explicit.commit.renames.prohibit.multiple.calls" value="false" />
</component>
<component name="StatusBar">
<option name="widgets">
<map>
<entry key="Memory" value="true" />
</map>
</option>
</component>
</application>

3
mavenVersion.xml Normal file
View File

@ -0,0 +1,3 @@
<application>
<component name="MavenVersion" mavenHome="$APPLICATION_HOME_DIR$/plugins/maven/lib/maven3" />
</application>

View File

@ -14,6 +14,10 @@
<option name="url" value="https://github.com/aikomastboom/Prototyper.git" />
<option name="userName" value="" />
</UrlAndUserName>
<UrlAndUserName>
<option name="url" value="https://github.com/Exact-Go/docker-machine-ip-config.git" />
<option name="userName" value="" />
</UrlAndUserName>
</list>
</option>
<option name="cloneParentDir" value="$USER_HOME$/Development" />