IU-2019.3.3 <aiko@pro.local Merge branch 'master'

Conflicts:
	diff.xml
This commit is contained in:
Aiko Mastboom 2020-05-01 18:02:48 +02:00
commit 526c5273e8
5 changed files with 20 additions and 2 deletions

View File

@ -1 +1,3 @@
<code_scheme name="Default" version="173" /> <code_scheme name="Default" version="173">
<option name="AUTODETECT_INDENTS" value="false" />
</code_scheme>

View File

@ -116,8 +116,13 @@
<option name="auto-sync" value="true" /> <option name="auto-sync" value="true" />
</driver> </driver>
<driver id="mongo"> <driver id="mongo">
<artifact name="MongoDB" use="true" /> <artifact name="MongoDB" use="true" version="1.7.2" />
<option name="auto-sync" value="true" /> <option name="auto-sync" value="true" />
<option name="auto-commit" value="true" />
<option name="format-sources-on-sync" value="true" />
<option name="send-app-info" value="true" />
<option name="source-loading" value="USER_SOURCES" />
<option name="schema-control" value="AUTOMATIC" />
</driver> </driver>
</component> </component>
</application> </application>

View File

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

View File

@ -2,6 +2,8 @@
<component name="FindSettings"> <component name="FindSettings">
<option name="customScope" value="All Places" /> <option name="customScope" value="All Places" />
<option name="defaultScopeName" value="All Places" /> <option name="defaultScopeName" value="All Places" />
<option name="localCaseSensitive" value="true" />
<option name="LOCAL_CASE_SENSITIVE_SEARCH" value="true" />
<option name="SEARCH_SCOPE" value="All Places" /> <option name="SEARCH_SCOPE" value="All Places" />
<mask>*.css</mask> <mask>*.css</mask>
<mask>*.html</mask> <mask>*.html</mask>

View File

@ -10,6 +10,10 @@
<option name="url" value="https://Gogs@gogs.40n8.me/aiko/angular-otap-board.git/" /> <option name="url" value="https://Gogs@gogs.40n8.me/aiko/angular-otap-board.git/" />
<option name="userName" value="" /> <option name="userName" value="" />
</UrlAndUserName> </UrlAndUserName>
<UrlAndUserName>
<option name="url" value="https://github.com/aikomastboom/Prototyper.git" />
<option name="userName" value="" />
</UrlAndUserName>
</list> </list>
</option> </option>
<option name="cloneParentDir" value="$USER_HOME$/Development" /> <option name="cloneParentDir" value="$USER_HOME$/Development" />