|
@@ -3,7 +3,10 @@
|
|
|
<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/" />
|
|
@@ -19,8 +22,13 @@
|
|
|
<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>
|
|
@@ -35,10 +43,10 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/contact.html">
|
|
|
+ <entry file="file://$PROJECT_DIR$/css/custom/main.css">
|
|
|
<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" />
|
|
|
+ <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>
|
|
@@ -46,35 +54,53 @@
|
|
|
<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="221">
|
|
|
- <caret line="502" column="9" lean-forward="true" selection-start-line="502" selection-start-column="9" selection-end-line="516" selection-end-column="10" />
|
|
|
+ <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$/cv.html">
|
|
|
+ <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="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/projets/pro_static_site.html">
|
|
|
+ <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>
|
|
@@ -82,8 +108,8 @@
|
|
|
<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="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="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>
|
|
@@ -91,7 +117,7 @@
|
|
|
<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="701">
|
|
|
+ <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>
|
|
@@ -100,8 +126,8 @@
|
|
|
<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="336">
|
|
|
- <caret line="4608" column="15" selection-start-line="4608" selection-start-column="3" selection-end-line="4608" selection-end-column="15" />
|
|
|
+ <state relative-caret-position="279">
|
|
|
+ <caret line="4886" selection-start-line="4886" selection-end-line="4890" selection-end-column="1" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -132,6 +158,7 @@
|
|
|
<find>cursor</find>
|
|
|
<find>col-4</find>
|
|
|
<find>card-columns</find>
|
|
|
+ <find>media</find>
|
|
|
</findStrings>
|
|
|
<replaceStrings>
|
|
|
<replace>class="col-9"</replace>
|
|
@@ -149,15 +176,24 @@
|
|
|
<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_ascii_space.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>
|
|
@@ -247,7 +283,11 @@
|
|
|
<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" />
|
|
@@ -278,20 +318,21 @@
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$PROJECT_DIR$/html/home.html" />
|
|
|
<entry file="file://$PROJECT_DIR$/home.html" />
|
|
|
- <entry file="file://$PROJECT_DIR$/css/custom/main.css">
|
|
|
+ <entry file="file://$PROJECT_DIR$/projets/pro_static_site.html">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="266">
|
|
|
- <caret line="14" column="30" selection-start-line="14" selection-start-column="23" selection-end-line="14" selection-end-column="30" />
|
|
|
+ <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$/css/custom/pagination.css">
|
|
|
+ <entry file="file://$PROJECT_DIR$/contact.html">
|
|
|
<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" />
|
|
|
+ <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">
|
|
@@ -303,11 +344,39 @@
|
|
|
<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>
|
|
@@ -317,34 +386,62 @@
|
|
|
<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="221">
|
|
|
- <caret line="502" column="9" lean-forward="true" selection-start-line="502" selection-start-column="9" selection-end-line="516" selection-end-column="10" />
|
|
|
+ <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$/projects.html">
|
|
|
+ <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>
|