From 0c3aece35ce9a31e0ec9512aab838c3d78616e9b Mon Sep 17 00:00:00 2001
From: jvdhorst <you@example.com>
Date: Wed, 28 Mar 2018 11:38:14 +0200
Subject: [PATCH] removed conflict header

---
 05/index.html | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/05/index.html b/05/index.html
index cea1447..86e0bd3 100644
--- a/05/index.html
+++ b/05/index.html
@@ -26,26 +26,7 @@
   <div class="background" >
   </div>
   <div class="content" >
-<<<<<<< HEAD
     <h1>Special Issue 5 - OuNuPo</h1>
-=======
-    <h1> OuNuPo </h1>
-    <div class="seperator">
-      <p>------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------</p>
-    </div>
-    <p><b>Special Issue 5</b></p>
-    <p>The XPUB practitioners are currently working on OuNuPo: the 5th Special Issue with and around book scanning culture. XPUB is the Experimental Publishing master at the Piet Zwart Institute.</p>
-    <p>Wednesday March 28, 19:00, Worm - <a href="https://www.openstreetmap.org/node/2610271782" popup="yes">Boomgaardsstraat 71</a></p>
-</br>
-    <p>Audio of the Pre-Launch at Varia:</p>
-    <div class="audio">
-      <audio controls>
-	<source src="http://pzwart1.wdka.hro.nl/~amansoux/SP5%20Beta%20Launch%2048.ogg" type="audio/ogg">
-	  <source src="http://pzwart1.wdka.hro.nl/~aroidl/varia_pre_launch.aac" type="audio/acc">
-	    Your browser does not support the audio element.
-      </audio>
-    </div>
->>>>>>> fc40f65560d13e5a96fd92d7f462920cdf2ada01
     <div class="image">
       <img src="images/try_scanning_loop.gif" alt="scanning" style="width: 50%;float: right;">
     </div>
@@ -117,12 +98,12 @@ reading_structure: ocr/output.txt
     <h3>Chapter 4 - Natasha Berting</h3>
     <em>How Bias Spreads from the Canon to the Web + Erase / Replace</em>
 	<pre>
-erase: tiffs hocrs 
+erase: tiffs hocrs
     python3 src/erase_leastcommon.py
     rm $(input-hocr)
     rm $(images-tiff)
 
-replace:tiffs hocrs 
+replace:tiffs hocrs
     python3 src/replace_leastcommon.py
     rm $(input-hocr)
     rm $(images-tiff)
@@ -277,7 +258,7 @@ ttssr-human-only: ocr/output.txt
 <li>&quot;Download&quot;</li>
 </ul></li>
 </ul>
-    
+
   </div>
 </body>
 </html>