|
@@ -1,456 +0,0 @@
|
|
|
-<?xml version="1.0" encoding="UTF-8"?>
|
|
|
-<project version="4">
|
|
|
- <component name="ChangeListManager">
|
|
|
- <list default="true" id="458baa9a-0ac3-475e-8174-3ab8ea444385" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
-<<<<<<< HEAD
|
|
|
- <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
|
|
|
-=======
|
|
|
->>>>>>> master
|
|
|
- </list>
|
|
|
- <ignored path="$PROJECT_DIR$/.tmp/" />
|
|
|
- <ignored path="$PROJECT_DIR$/temp/" />
|
|
|
- <ignored path="$PROJECT_DIR$/tmp/" />
|
|
|
- <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
- <option name="SHOW_DIALOG" value="false" />
|
|
|
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
|
- <option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
- </component>
|
|
|
- <component name="FileEditorManager">
|
|
|
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/projects.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
-<<<<<<< HEAD
|
|
|
- <state relative-caret-position="12">
|
|
|
- <caret line="233" column="22" selection-start-line="233" selection-start-column="22" selection-end-line="233" selection-end-column="22" />
|
|
|
-=======
|
|
|
- <state relative-caret-position="570">
|
|
|
- <caret line="148" column="25" selection-start-line="148" selection-start-column="25" selection-end-line="148" selection-end-column="25" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/css/custom/pagination.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="684">
|
|
|
- <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/css/custom/main.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="285">
|
|
|
- <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_ascii_space.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="468">
|
|
|
- <caret line="359" column="16" lean-forward="true" selection-start-line="359" selection-start-column="16" selection-end-line="359" selection-end-column="16" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
-<<<<<<< HEAD
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/index.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="544">
|
|
|
- <caret line="91" column="75" lean-forward="true" selection-start-line="91" selection-start-column="75" selection-end-line="91" selection-end-column="75" />
|
|
|
-=======
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/cv.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="171">
|
|
|
- <caret line="24" column="33" lean-forward="true" selection-start-line="24" selection-start-column="33" selection-end-line="28" selection-end-column="20" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/index.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
-<<<<<<< HEAD
|
|
|
- <state relative-caret-position="430">
|
|
|
- <caret line="405" column="4" lean-forward="true" selection-start-line="405" selection-start-column="4" selection-end-line="412" selection-end-column="10" />
|
|
|
-=======
|
|
|
- <state relative-caret-position="316">
|
|
|
- <caret line="75" column="29" selection-end-line="98" selection-end-column="7" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
- <entry file="file://$PROJECT_DIR$/error404.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
-<<<<<<< HEAD
|
|
|
- <state relative-caret-position="399">
|
|
|
- <caret line="78" column="10" lean-forward="true" selection-start-line="78" selection-start-column="10" selection-end-line="78" selection-end-column="10" />
|
|
|
-=======
|
|
|
- <state relative-caret-position="658">
|
|
|
- <caret line="85" column="10" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_quoridor.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1463">
|
|
|
- <caret line="77" column="10" selection-start-line="77" selection-start-column="10" selection-end-line="89" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_pulsar.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1672">
|
|
|
- <caret line="88" column="10" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/css/bootstrap.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="279">
|
|
|
- <caret line="4886" selection-start-line="4886" selection-end-line="4890" selection-end-column="1" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- </leaf>
|
|
|
- </component>
|
|
|
- <component name="FileTemplateManagerImpl">
|
|
|
- <option name="RECENT_TEMPLATES">
|
|
|
- <list>
|
|
|
- <option value="HTML File" />
|
|
|
- <option value="CSS File" />
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </component>
|
|
|
- <component name="FindInProjectRecents">
|
|
|
- <findStrings>
|
|
|
- <find>em</find>
|
|
|
- <find>class="col-8"</find>
|
|
|
- <find>h2</find>
|
|
|
- <find>bg-success</find>
|
|
|
- <find><em>([a-z\wé]*)</em></find>
|
|
|
- <find><em>([\sa-zé]*)</em></find>
|
|
|
- <find></b>(\s*:[–\sa-zé]*)<span class="city"></find>
|
|
|
- <find>pagination</find>
|
|
|
- <find>page-item</find>
|
|
|
- <find>page-link</find>
|
|
|
- <find>disabled</find>
|
|
|
- <find>cursor</find>
|
|
|
- <find>col-4</find>
|
|
|
- <find>card-columns</find>
|
|
|
- <find>media</find>
|
|
|
- </findStrings>
|
|
|
- <replaceStrings>
|
|
|
- <replace>class="col-9"</replace>
|
|
|
- <replace>h4</replace>
|
|
|
- <replace><span class="city">$1</span></replace>
|
|
|
- <replace></b><span class="middle-info">$1</span><span class="city"></replace>
|
|
|
- <replace>col-xl-4 col-lg-6 col-md-12</replace>
|
|
|
- </replaceStrings>
|
|
|
- </component>
|
|
|
- <component name="Git.Settings">
|
|
|
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
- </component>
|
|
|
- <component name="IdeDocumentHistory">
|
|
|
- <option name="CHANGED_PATHS">
|
|
|
- <list>
|
|
|
- <option value="$PROJECT_DIR$/home.html" />
|
|
|
- <option value="$PROJECT_DIR$/cv.html" />
|
|
|
-<<<<<<< HEAD
|
|
|
- <option value="$PROJECT_DIR$/css/custom/main.css" />
|
|
|
-=======
|
|
|
->>>>>>> master
|
|
|
- <option value="$PROJECT_DIR$/css/custom/pagination.css" />
|
|
|
- <option value="$PROJECT_DIR$/projets/pro_static_site.html" />
|
|
|
- <option value="$PROJECT_DIR$/contact.html" />
|
|
|
- <option value="$PROJECT_DIR$/projets/pro_quoridor.html" />
|
|
|
- <option value="$PROJECT_DIR$/projets/pro_pulsar.html" />
|
|
|
- <option value="$PROJECT_DIR$/projects.html" />
|
|
|
-<<<<<<< HEAD
|
|
|
- <option value="$PROJECT_DIR$/index.html" />
|
|
|
-=======
|
|
|
- <option value="$PROJECT_DIR$/css/custom/main.css" />
|
|
|
- <option value="$PROJECT_DIR$/projets/pro_ascii_space.html" />
|
|
|
- <option value="$PROJECT_DIR$/index.html" />
|
|
|
- <option value="$PROJECT_DIR$/error404.html" />
|
|
|
->>>>>>> master
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </component>
|
|
|
- <component name="ProjectFrameBounds" extendedState="6">
|
|
|
- <option name="x" value="960" />
|
|
|
- <option name="y" value="28" />
|
|
|
- <option name="width" value="960" />
|
|
|
- <option name="height" value="1052" />
|
|
|
- </component>
|
|
|
- <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
- <component name="ProjectView">
|
|
|
- <navigator proportions="" version="1">
|
|
|
- <foldersAlwaysOnTop value="true" />
|
|
|
- </navigator>
|
|
|
- <panes>
|
|
|
- <pane id="Scope" />
|
|
|
- <pane id="ProjectPane">
|
|
|
- <subPane>
|
|
|
- <expand>
|
|
|
- <path>
|
|
|
- <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="css" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="css" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="custom" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="StaticJovian" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="StaticJovian" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="projets" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- </expand>
|
|
|
- <select />
|
|
|
- </subPane>
|
|
|
- </pane>
|
|
|
- </panes>
|
|
|
- </component>
|
|
|
- <component name="PropertiesComponent">
|
|
|
- <property name="DefaultHtmlFileTemplate" value="HTML File" />
|
|
|
- <property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
|
- <property name="list.type.of.created.stylesheet" value="CSS" />
|
|
|
- <property name="nodejs.mocha.mocha_node_package_dir" value="" />
|
|
|
- <property name="settings.editor.selected.configurable" value="web.server" />
|
|
|
- </component>
|
|
|
- <component name="RunDashboard">
|
|
|
- <option name="ruleStates">
|
|
|
- <list>
|
|
|
- <RuleState>
|
|
|
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
|
|
|
- </RuleState>
|
|
|
- <RuleState>
|
|
|
- <option name="name" value="StatusDashboardGroupingRule" />
|
|
|
- </RuleState>
|
|
|
- </list>
|
|
|
- </option>
|
|
|
- </component>
|
|
|
- <component name="SpellCheckerSettings" BundledDictionaries="1" BundledDictionary0="english.dic" Folders="0" CustomDictionaries="0" Dictionaries="0" CorrectionsLimit="5" DefaultDictionary="project-level" UseSingleDictionary="true" />
|
|
|
- <component name="SvnConfiguration">
|
|
|
- <configuration />
|
|
|
- </component>
|
|
|
- <component name="TaskManager">
|
|
|
- <task active="true" id="Default" summary="Default task">
|
|
|
- <changelist id="458baa9a-0ac3-475e-8174-3ab8ea444385" name="Default Changelist" comment="" />
|
|
|
- <created>1544351302156</created>
|
|
|
- <option name="number" value="Default" />
|
|
|
- <option name="presentableId" value="Default" />
|
|
|
- <updated>1544351302156</updated>
|
|
|
- <workItem from="1544351313044" duration="4545000" />
|
|
|
- <workItem from="1544467535946" duration="8368000" />
|
|
|
- <workItem from="1544552178602" duration="6585000" />
|
|
|
- <workItem from="1544635542542" duration="4441000" />
|
|
|
- <workItem from="1545071688272" duration="7592000" />
|
|
|
- <workItem from="1547284178594" duration="3205000" />
|
|
|
- <workItem from="1547575616175" duration="4557000" />
|
|
|
- <workItem from="1547893759808" duration="7192000" />
|
|
|
- <workItem from="1547980991085" duration="6558000" />
|
|
|
- </task>
|
|
|
- <servers />
|
|
|
- </component>
|
|
|
- <component name="TimeTrackingManager">
|
|
|
-<<<<<<< HEAD
|
|
|
- <option name="totallyTimeSpent" value="53043000" />
|
|
|
-=======
|
|
|
- <option name="totallyTimeSpent" value="55324000" />
|
|
|
->>>>>>> master
|
|
|
- </component>
|
|
|
- <component name="ToolWindowManager">
|
|
|
- <frame x="-3" y="28" width="1926" height="1055" extended-state="6" />
|
|
|
- <editor active="true" />
|
|
|
- <layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.10648392" />
|
|
|
- <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
- <window_info id="Favorites" order="2" side_tool="true" />
|
|
|
- <window_info anchor="bottom" id="Message" order="0" />
|
|
|
- <window_info anchor="bottom" id="Find" order="1" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" />
|
|
|
- <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
|
|
|
- <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
- <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
- <window_info anchor="bottom" id="TODO" order="6" />
|
|
|
- <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
|
|
|
- <window_info anchor="bottom" id="Version Control" order="8" />
|
|
|
- <window_info anchor="bottom" id="Terminal" order="9" />
|
|
|
- <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
|
|
|
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
- <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
- <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- </layout>
|
|
|
- </component>
|
|
|
- <component name="TypeScriptGeneratedFilesManager">
|
|
|
- <option name="version" value="1" />
|
|
|
- </component>
|
|
|
- <component name="editorHistoryManager">
|
|
|
- <entry file="file://$PROJECT_DIR$/html/home.html" />
|
|
|
- <entry file="file://$PROJECT_DIR$/home.html" />
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_static_site.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1482">
|
|
|
- <caret line="78" column="10" lean-forward="true" selection-start-line="78" selection-start-column="10" selection-end-line="78" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/contact.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="684">
|
|
|
- <caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
-<<<<<<< HEAD
|
|
|
- <entry file="file://$PROJECT_DIR$/css/bootstrap.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="336">
|
|
|
- <caret line="4608" column="15" selection-start-line="4608" selection-start-column="3" selection-end-line="4608" selection-end-column="15" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/contact.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="399">
|
|
|
- <caret line="36" column="17" lean-forward="true" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" />
|
|
|
-=======
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_quoridor.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1463">
|
|
|
- <caret line="77" column="10" selection-start-line="77" selection-start-column="10" selection-end-line="89" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_pulsar.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="1672">
|
|
|
- <caret line="88" column="10" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/projects.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="570">
|
|
|
- <caret line="148" column="25" selection-start-line="148" selection-start-column="25" selection-end-line="148" selection-end-column="25" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/css/custom/pagination.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="684">
|
|
|
- <caret line="36" column="33" selection-start-line="36" selection-start-column="33" selection-end-line="36" selection-end-column="33" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_pulsar.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
-<<<<<<< HEAD
|
|
|
- <state relative-caret-position="701">
|
|
|
- <caret line="88" column="10" selection-start-line="88" selection-start-column="10" selection-end-line="88" selection-end-column="10" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_quoridor.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="259">
|
|
|
- <caret line="77" column="10" lean-forward="true" selection-start-line="77" selection-start-column="10" selection-end-line="89" selection-end-column="10" />
|
|
|
-=======
|
|
|
- <state relative-caret-position="279">
|
|
|
- <caret line="4886" selection-start-line="4886" selection-end-line="4890" selection-end-column="1" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/css/custom/main.css">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="285">
|
|
|
- <caret line="15" column="1" selection-start-line="15" selection-start-column="1" selection-end-line="15" selection-end-column="1" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_ascii_space.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="468">
|
|
|
- <caret line="359" column="16" lean-forward="true" selection-start-line="359" selection-start-column="16" selection-end-line="359" selection-end-column="16" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
-<<<<<<< HEAD
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_static_site.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="399">
|
|
|
- <caret line="78" column="10" lean-forward="true" selection-start-line="78" selection-start-column="10" selection-end-line="78" selection-end-column="10" />
|
|
|
-=======
|
|
|
- <entry file="file://$PROJECT_DIR$/index.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="316">
|
|
|
- <caret line="75" column="29" selection-end-line="98" selection-end-column="7" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/cv.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
-<<<<<<< HEAD
|
|
|
- <state relative-caret-position="430">
|
|
|
- <caret line="405" column="4" lean-forward="true" selection-start-line="405" selection-start-column="4" selection-end-line="412" selection-end-column="10" />
|
|
|
-=======
|
|
|
- <state relative-caret-position="171">
|
|
|
- <caret line="24" column="33" lean-forward="true" selection-start-line="24" selection-start-column="33" selection-end-line="28" selection-end-column="20" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/error404.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
-<<<<<<< HEAD
|
|
|
- <state relative-caret-position="12">
|
|
|
- <caret line="233" column="22" selection-start-line="233" selection-start-column="22" selection-end-line="233" selection-end-column="22" />
|
|
|
-=======
|
|
|
- <state relative-caret-position="658">
|
|
|
- <caret line="85" column="10" selection-start-line="85" selection-start-column="10" selection-end-line="85" selection-end-column="10" />
|
|
|
->>>>>>> master
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/index.html">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="544">
|
|
|
- <caret line="91" column="75" lean-forward="true" selection-start-line="91" selection-start-column="75" selection-end-line="91" selection-end-column="75" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </component>
|
|
|
-</project>
|