R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Gabriel Modzelewski
2021-02-15 13:47:19 +01:00
parent 758da55688 1da7645519
commit 4c78b0d31a
4 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.idea/workspace.xml generated
View File

@@ -20,12 +20,17 @@
</component>
<component name="ChangeListManager">
<list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
<<<<<<< HEAD
<<<<<<< HEAD
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
=======
<change beforePath="$PROJECT_DIR$/src/main/resources/static/js/uianimation.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/uianimation.js" afterDir="false" />
>>>>>>> modzeleg
<change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
=======
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" afterDir="false" />
>>>>>>> modzeleg
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -208,7 +213,7 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
<configuration default="true" type="JetRunConfigurationType">
<module name="eureka" />
<option name="VM_PARAMETERS" />
<option name="PROGRAM_PARAMETERS" />
@@ -221,7 +226,7 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
<configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
<module name="eureka" />
<option name="filePath" />
<option name="vmParameters" />
@@ -316,8 +321,13 @@
<workItem from="1612442837870" duration="8318000" />
<workItem from="1612609113694" duration="13936000" />
<workItem from="1612777983977" duration="14203000" />
<<<<<<< HEAD
<workItem from="1612868404302" duration="14434000" />
<workItem from="1612955514317" duration="1990000" />
=======
<workItem from="1612868404302" duration="13841000" />
<workItem from="1613384221052" duration="5569000" />
>>>>>>> modzeleg
</task>
<task id="LOCAL-00077" summary="testing jenkins docker">
<created>1601453886631</created>
@@ -666,7 +676,7 @@
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
<option name="version" value="2" />
</component>
<component name="UnknownFeatures">
<option featureType="com.intellij.fileTypeFactory" implementationName="*.js" />
@@ -676,13 +686,12 @@
<map>
<entry key="MAIN">
<value>
<State>
<option name="COLUMN_ORDER" />
</State>
<State />
</value>
</entry>
</map>
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
@@ -873,4 +882,4 @@
</configuration>
</watches-manager>
</component>
</project>
</project>