From 09ec66c4181cd053cdd88e6ba3aff60ef6d9cada Mon Sep 17 00:00:00 2001
From: martind2000 <martind2000@gmail.com>
Date: Mon, 27 Jun 2016 20:47:58 +0100
Subject: [PATCH] wip2

---
 .idea/workspace.xml | 644 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 582 insertions(+), 62 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0586a7d..6ac04a6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,6 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="12c4e27b-c61f-42e7-8cb4-b2db565a855d" name="Default" comment="">
+<<<<<<< Updated upstream
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/risk/OEBPS/ak.jpg" />
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/risk/OEBPS/logo.jpg" />
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/risk/OEBPS/bio.xhtml" />
@@ -20,6 +21,24 @@
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/risk/OEBPS/toc.ncx" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/template.xhtml" afterPath="$PROJECT_DIR$/build/template.xhtml" />
+=======
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/shadowmaster/OEBPS/bio.xhtml" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/build/shadowmaster/OEBPS/imperaWeb.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/index.html" afterPath="$PROJECT_DIR$/build/index.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/mythlands/OEBPS/bio.xhtml" afterPath="$PROJECT_DIR$/build/mythlands/OEBPS/bio.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/mythlands/OEBPS/blurb.xhtml" afterPath="$PROJECT_DIR$/build/mythlands/OEBPS/blurb.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/mythlands/OEBPS/ch07.xhtml" afterPath="$PROJECT_DIR$/build/mythlands/OEBPS/ch07.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/mythlands/OEBPS/imperaWeb.css" afterPath="$PROJECT_DIR$/build/mythlands/OEBPS/imperaWeb.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/mythlands/OEBPS/other.xhtml" afterPath="$PROJECT_DIR$/build/mythlands/OEBPS/other.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/mythlands/OEBPS/title.xhtml" afterPath="$PROJECT_DIR$/build/mythlands/OEBPS/title.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/mythlands/OEBPS/toc.ncx" afterPath="$PROJECT_DIR$/build/mythlands/OEBPS/toc.ncx" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/spellbinder/OEBPS/blurb.xhtml" afterPath="$PROJECT_DIR$/build/spellbinder/OEBPS/blurb.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/spellbinder/OEBPS/imperaWeb.css" afterPath="$PROJECT_DIR$/build/spellbinder/OEBPS/imperaWeb.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/spellbinder/OEBPS/preview.xhtml" afterPath="$PROJECT_DIR$/build/spellbinder/OEBPS/preview.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/spellbinder/OEBPS/title.xhtml" afterPath="$PROJECT_DIR$/build/spellbinder/OEBPS/title.xhtml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/spellbinder/OEBPS/toc.ncx" afterPath="$PROJECT_DIR$/build/spellbinder/OEBPS/toc.ncx" />
+>>>>>>> Stashed changes
     </list>
     <ignored path="books.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -39,22 +58,119 @@
     <favorites_list name="books" />
   </component>
   <component name="FileEditorManager">
+<<<<<<< Updated upstream
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="ch01.xhtml" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/build/risk/OEBPS/ch01.xhtml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="266">
               <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+=======
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="450">
+      <file leaf-file-name="blurb.xhtml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/blurb.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="546">
+              <caret line="21" column="15" selection-start-line="0" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+>>>>>>> Stashed changes
               <folding />
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< Updated upstream
       <file leaf-file-name="template.xhtml" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/build/template.xhtml">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="171">
               <caret line="9" column="22" selection-start-line="0" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+=======
+      <file leaf-file-name="blurb.xhtml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/blurb.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="936">
+              <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="other.xhtml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/other.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="624">
+              <caret line="24" column="39" selection-start-line="0" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="other.xhtml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/other.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="962">
+              <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ch07.xhtml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/ch07.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="20072">
+              <caret line="772" column="3" selection-start-line="772" selection-start-column="3" selection-end-line="772" selection-end-column="3" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="bio.xhtml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/bio.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="624">
+              <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="imperaWeb.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/imperaWeb.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="6682">
+              <caret line="257" column="1" selection-start-line="257" selection-start-column="1" selection-end-line="257" selection-end-column="1" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="title.xhtml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/title.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1118">
+              <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="imperaWeb.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/imperaWeb.css">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="bio.xhtml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/bio.xhtml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="0">
+              <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+>>>>>>> Stashed changes
               <folding />
             </state>
           </provider>
@@ -76,11 +192,14 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< Updated upstream
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike16.xhtml" />
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike38.xhtml" />
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike19.xhtml" />
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike39.xhtml" />
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike04.xhtml" />
+=======
+>>>>>>> Stashed changes
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike37.xhtml" />
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike24.xhtml" />
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/shrike27.xhtml" />
@@ -92,8 +211,6 @@
         <option value="$PROJECT_DIR$/build/darkvalley/OEBPS/title.xhtml" />
         <option value="$PROJECT_DIR$/build/Full Proof/OEBPS/title.xhtml" />
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/Shrike-title.xhtml" />
-        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/title.xhtml" />
-        <option value="$PROJECT_DIR$/build/spellbinder/OEBPS/title.xhtml" />
         <option value="$PROJECT_DIR$/build/mythlands/OEBPS/ch02.xhtml" />
         <option value="$PROJECT_DIR$/build/incubus/OEBPS/incubus28.xhtml" />
         <option value="$PROJECT_DIR$/build/incubus/OEBPS/incubus27.xhtml" />
@@ -113,10 +230,7 @@
         <option value="$PROJECT_DIR$/build/darkvalley/OEBPS/010.xhtml" />
         <option value="$PROJECT_DIR$/build/darkvalley/OEBPS/022.xhtml" />
         <option value="$PROJECT_DIR$/build/index.html" />
-        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/imperaWeb.css" />
         <option value="$PROJECT_DIR$/build/mythlands/OEBPS/preview.xhtml" />
-        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/blurb.xhtml" />
-        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/bio.xhtml" />
         <option value="$PROJECT_DIR$/build/bane/OEBPS/bio.xhtml" />
         <option value="$PROJECT_DIR$/build/darkvalley/OEBPS/bio.xhtml" />
         <option value="$PROJECT_DIR$/build/Full Proof/OEBPS/bio.xhtml" />
@@ -124,9 +238,24 @@
         <option value="$PROJECT_DIR$/build/shrike/OEBPS/bio.xhtml" />
         <option value="$PROJECT_DIR$/build/spellbinder/OEBPS/bio.xhtml" />
         <option value="$PROJECT_DIR$/tools/buildBook.bat" />
+        <option value="$PROJECT_DIR$/build/spellbinder/OEBPS/imperaWeb.css" />
+        <option value="$PROJECT_DIR$/build/spellbinder/OEBPS/blurb.xhtml" />
+        <option value="$PROJECT_DIR$/build/spellbinder/OEBPS/preview.xhtml" />
+        <option value="$PROJECT_DIR$/build/spellbinder/OEBPS/title.xhtml" />
+        <option value="$PROJECT_DIR$/build/spellbinder/OEBPS/toc.ncx" />
         <option value="$APPLICATION_CONFIG_DIR$/scratches/scratch.xhtml" />
+<<<<<<< Updated upstream
         <option value="$PROJECT_DIR$/build/template.xhtml" />
         <option value="$PROJECT_DIR$/build/risk/OEBPS/ch01.xhtml" />
+=======
+        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/bio.xhtml" />
+        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/blurb.xhtml" />
+        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/ch07.xhtml" />
+        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/imperaWeb.css" />
+        <option value="$PROJECT_DIR$/build/mythlands/OEBPS/title.xhtml" />
+        <option value="$PROJECT_DIR$/build/shadowmaster/OEBPS/blurb.xhtml" />
+        <option value="$PROJECT_DIR$/build/shadowmaster/OEBPS/other.xhtml" />
+>>>>>>> Stashed changes
       </list>
     </option>
   </component>
@@ -137,9 +266,16 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds">
+<<<<<<< Updated upstream
     <option name="y" value="23" />
     <option name="width" value="1920" />
     <option name="height" value="1177" />
+=======
+    <option name="x" value="798" />
+    <option name="y" value="2" />
+    <option name="width" value="3042" />
+    <option name="height" value="1958" />
+>>>>>>> Stashed changes
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -215,21 +351,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
+<<<<<<< Updated upstream
               <option name="myItemId" value="source" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="books" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="booksnew" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="compiled" />
+=======
+              <option name="myItemId" value="build" />
+>>>>>>> Stashed changes
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -246,6 +372,32 @@
               <option name="myItemId" value="build" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="shadowmaster" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="books" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="booksnew" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="build" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="shadowmaster" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="OEBPS" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -317,6 +469,7 @@
     <property name="settings.editor.splitter.proportion" value="0.2" />
     <property name="recentsLimit" value="5" />
     <property name="DefaultHtmlFileTemplate" value="Xhtml" />
+<<<<<<< Updated upstream
     <property name="FullScreen" value="false" />
     <property name="js-jscs-nodeInterpreter" value="$USER_HOME$/.nvm/versions/node/v5.7.0/bin/node" />
     <property name="js-jscs-package" value="$USER_HOME$/.nvm/versions/node/v5.7.0/lib/node_modules/jscs" />
@@ -324,6 +477,13 @@
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/build/risk/OEBPS" />
+=======
+    <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
+  </component>
+  <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\Users\marti\dev\booksnew\build\shadowmaster\OEBPS" />
+>>>>>>> Stashed changes
       <recent name="D:\dev\books\build\incubus\OEBPS" />
     </key>
   </component>
@@ -418,8 +578,15 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1436969143723</updated>
+<<<<<<< Updated upstream
       <workItem from="1463341057783" duration="2064000" />
       <workItem from="1467039747900" duration="1023000" />
+=======
+      <workItem from="1463341057783" duration="2083000" />
+      <workItem from="1463350911225" duration="8000" />
+      <workItem from="1463433956220" duration="2054000" />
+      <workItem from="1463769048170" duration="80000" />
+>>>>>>> Stashed changes
     </task>
     <task id="LOCAL-00001" summary="Updated index file">
       <created>1436969956070</created>
@@ -449,22 +616,40 @@
       <option name="project" value="LOCAL" />
       <updated>1441845272674</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="lots and lots of stuff">
+      <created>1463346672575</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1463346672575</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< Updated upstream
     <option name="totallyTimeSpent" value="3087000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="23" width="1920" height="1177" extended-state="6" />
+=======
+    <option name="totallyTimeSpent" value="4225000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="798" y="2" width="3042" height="1958" extended-state="0" />
+>>>>>>> Stashed changes
     <editor active="false" />
     <layout>
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16061085" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.36671132" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="SonarLint" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32946146" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+<<<<<<< Updated upstream
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.22337417" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13006598" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+=======
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.180839" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+>>>>>>> Stashed changes
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -507,6 +692,7 @@
     <watches-manager />
   </component>
   <component name="editorHistoryManager">
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus27.xhtml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -669,26 +855,206 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/bio.xhtml">
+=======
+    <entry file="file://$PROJECT_DIR$/build/shrike/OEBPS/Shrike-title.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="48" column="0" selection-start-line="48" selection-start-column="0" selection-end-line="48" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/ch02.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="65" column="56" selection-start-line="65" selection-start-column="56" selection-end-line="65" selection-end-column="56" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus28.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="314" column="58" selection-start-line="314" selection-start-column="58" selection-end-line="314" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus27.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="375" column="50" selection-start-line="375" selection-start-column="50" selection-end-line="375" selection-end-column="50" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus26.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="360" column="47" selection-start-line="360" selection-start-column="47" selection-end-line="360" selection-end-column="47" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus22.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="333" column="58" selection-start-line="333" selection-start-column="58" selection-end-line="333" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus30.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="365" column="44" selection-start-line="365" selection-start-column="44" selection-end-line="365" selection-end-column="44" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus13.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="239" column="27" selection-start-line="239" selection-start-column="27" selection-end-line="239" selection-end-column="27" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus18.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="109" column="15" selection-start-line="109" selection-start-column="15" selection-end-line="109" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus11.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="73" column="31" selection-start-line="73" selection-start-column="31" selection-end-line="73" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus25.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="154" column="18" selection-start-line="154" selection-start-column="18" selection-end-line="154" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/Full Proof/OEBPS/ch22.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="53" column="110" selection-start-line="53" selection-start-column="110" selection-end-line="53" selection-end-column="110" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/Full Proof/OEBPS/ch26.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="287" column="26" selection-start-line="287" selection-start-column="26" selection-end-line="287" selection-end-column="26" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/Full Proof/OEBPS/ch05.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="480" column="88" selection-start-line="480" selection-start-column="88" selection-end-line="480" selection-end-column="88" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/Full Proof/OEBPS/ch04.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="332" column="34" selection-start-line="332" selection-start-column="34" selection-end-line="332" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus01.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="204" column="359" selection-start-line="204" selection-start-column="359" selection-end-line="204" selection-end-column="359" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/incubus31.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="318" column="49" selection-start-line="318" selection-start-column="49" selection-end-line="318" selection-end-column="49" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/010.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="292" column="51" selection-start-line="292" selection-start-column="51" selection-end-line="292" selection-end-column="51" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/022.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="676" column="67" selection-start-line="676" selection-start-column="67" selection-end-line="676" selection-end-column="67" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/toc.ncx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="1" column="25" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/content.opf">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="2" column="65" selection-start-line="2" selection-start-column="65" selection-end-line="2" selection-end-column="65" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/001.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="6" column="94" selection-start-line="6" selection-start-column="94" selection-end-line="6" selection-end-column="94" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/index.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="67" column="58" selection-start-line="67" selection-start-column="58" selection-end-line="67" selection-end-column="58" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/imperaWeb.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="82" column="31" selection-start-line="82" selection-start-column="31" selection-end-line="82" selection-end-column="31" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/bane/OEBPS/bio.xhtml">
+>>>>>>> Stashed changes
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/build/Full Proof/OEBPS/bio.xhtml">
+=======
+    <entry file="file://$PROJECT_DIR$/build/darkvalley/OEBPS/bio.xhtml">
+>>>>>>> Stashed changes
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/bio.xhtml">
+=======
+    <entry file="file://$PROJECT_DIR$/build/Full Proof/OEBPS/bio.xhtml">
+>>>>>>> Stashed changes
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/bio.xhtml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -707,6 +1073,26 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="10" column="7" selection-start-line="10" selection-start-column="7" selection-end-line="10" selection-end-column="7" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/incubus/OEBPS/bio.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/bio.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="12" column="15" selection-start-line="12" selection-start-column="15" selection-end-line="12" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/shrike/OEBPS/bio.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
+>>>>>>> Stashed changes
         </state>
       </provider>
     </entry>
@@ -717,6 +1103,7 @@
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/tools/buildBook.bat">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="171">
@@ -802,78 +1189,211 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/ch35.xhtml">
+=======
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/imperaWeb.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/ch37.xhtml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/blurb.xhtml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/other.xhtml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/preview.xhtml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="0">
-          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
+        <state relative-caret-position="1321">
+          <caret line="280" column="1" selection-start-line="280" selection-start-column="1" selection-end-line="280" selection-end-column="1" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/ch01.xhtml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-418">
+        <state relative-caret-position="104">
+          <caret line="4" column="42" selection-start-line="4" selection-start-column="42" selection-end-line="4" selection-end-column="42" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/preview.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="775">
+          <caret line="442" column="11" selection-start-line="442" selection-start-column="11" selection-end-line="442" selection-end-column="11" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/title.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="806">
+          <caret line="31" column="0" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/toc.ncx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tools/buildBook.bat">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="364">
+          <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/toc.ncx">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="4680">
+          <caret line="180" column="29" selection-start-line="180" selection-start-column="29" selection-end-line="180" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/blurb.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="858">
+          <caret line="33" column="52" selection-start-line="20" selection-start-column="11" selection-end-line="33" selection-end-column="52" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/ch01.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$APPLICATION_CONFIG_DIR$/scratches/scratch.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="106" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="143" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/bio.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="624">
+          <caret line="24" column="13" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+>>>>>>> Stashed changes
+          <folding />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< Updated upstream
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/ch35.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/ch07.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="20072">
+          <caret line="772" column="3" selection-start-line="772" selection-start-column="3" selection-end-line="772" selection-end-column="3" />
+>>>>>>> Stashed changes
+          <folding />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< Updated upstream
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/ch37.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/imperaWeb.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="6682">
+          <caret line="257" column="1" selection-start-line="257" selection-start-column="1" selection-end-line="257" selection-end-column="1" />
+>>>>>>> Stashed changes
+          <folding />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< Updated upstream
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/blurb.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/title.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1118">
+          <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
+>>>>>>> Stashed changes
+          <folding />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< Updated upstream
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/other.xhtml">
+=======
+    <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/imperaWeb.css">
+>>>>>>> Stashed changes
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/preview.xhtml">
+=======
+    <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/bio.xhtml">
+>>>>>>> Stashed changes
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< Updated upstream
+    <entry file="file://$PROJECT_DIR$/build/spellbinder/OEBPS/ch01.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-418">
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/blurb.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="546">
+          <caret line="21" column="15" selection-start-line="0" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+>>>>>>> Stashed changes
+          <folding />
+        </state>
+      </provider>
+    </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/build/bane/OEBPS/other.xhtml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="266">
           <caret line="29" column="11" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="11" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/blurb.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="936">
+          <caret line="36" column="0" selection-start-line="36" selection-start-column="0" selection-end-line="36" selection-end-column="0" />
+>>>>>>> Stashed changes
           <folding />
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/build/template.xhtml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="171">
           <caret line="9" column="22" selection-start-line="0" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/mythlands/OEBPS/other.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="624">
+          <caret line="24" column="39" selection-start-line="0" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+>>>>>>> Stashed changes
           <folding />
         </state>
       </provider>
     </entry>
+<<<<<<< Updated upstream
     <entry file="file://$PROJECT_DIR$/build/risk/OEBPS/ch01.xhtml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="266">
           <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+=======
+    <entry file="file://$PROJECT_DIR$/build/shadowmaster/OEBPS/other.xhtml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="962">
+          <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
+>>>>>>> Stashed changes
           <folding />
         </state>
       </provider>