Fix conflict in blogpost template

htdocs/artefact/blog/theme/default/editpost.tpl

@@ -9,44 +9,6 @@
 {include file="sidebar.tpl"}
 
 {include file="columnleftstart.tpl"}
-<<<<<<< Updated upstream:htdocs/artefact/blog/theme/default/editpost.tpl
         {$form}
-=======
-        {$textinputform}
-        <div id='uploader'></div>
-        <div id='browsebuttonstuff'>
-          <input id='browsebutton' type='button' class='button' value='{str tag=browsemyfiles section=artefact.blog}'>
-        </div>
-        <div id='browsemyfiles' style='display: none;'>
-          <h3>{str tag=myfiles section='artefact.file'}</h3>
-          <table id='filebrowser' class='tablerenderer fullwidth'>
-            <thead><tr>
-              <th></th>
-              <th>{str section=artefact.file tag=Name}</th>
-              <th>{str section=artefact.file tag=Description}</th>
-              <th>{str section=artefact.file tag=Size}</th>
-              <th>{str section=artefact.file tag=Date}</th>
-              <th></th>
-            </tr></thead>
-            <tbody><tr><td></td></tr></tbody>
-          </table>
-        </div>
-        <h3>{str section=artefact.blog tag=attachedfiles}</h3>
-        <table id='attachedfiles' class='tablerenderer fullwidth'>
-          <thead><tr>
-            <th></th>
-            <th>{str section=artefact.file tag=Name}</th>
-            <th>{str section=artefact.file tag=Description}</th>
-            <th>{str tag=tags}</th>
-            <th></th>
-          </tr></thead>
-          <tbody><tr><td></td></tr></tbody>
-        </table>
-        {$draftform}
-        <div id='savecancel'>
-          <input type='button' class='button' value='{str tag=savepost section=artefact.blog}' onclick="saveblogpost()">
-          <input type='button' class='cancel' value='{str tag=cancel}' onclick="canceledit()">
-        </div>
->>>>>>> Stashed changes:htdocs/artefact/blog/theme/default/editpost.tpl
 {include file="columnleftend.tpl"}
 {include file="footer.tpl"}