conflict resolution

[org.ibex.core.git] / doc / reference / reference.xml

diff --git a/doc/reference/reference.xml b/doc/reference/reference.xml
index ac79dec..28f8a34 100644 (file)
--- a/doc/reference/reference.xml
+++ b/doc/reference/reference.xml
@@ -255,8 +255,7 @@
       and written) from both static scripts as well as instance
       scripts in a particular template. FIXME
       </definition>
-
-    </section>
+  </section>
   
   <section title="Metadata">
 
@@ -614,7 +613,7 @@
       the alignment point of that rectangle of cells.
 
   </section>
-  
+
   <section title="Rendering">
 
     Boxes are rendered in a depth-first, pre-order traversal.  Note that
@@ -2419,5 +2418,5 @@
 Copyright (C) 2004 Adam Megacz, verbatim redistribution permitted.
 Ibex is a trademark of Adam Megacz
 **
-    
+
 </ibex-doc>
\ No newline at end of file