Index: library/doc/html/hierarchy.html
===================================================================
--- library/doc/html/hierarchy.html (revision 396)
+++ library/doc/html/hierarchy.html (revision 397)
@@ -136,5 +136,8 @@
           </div>
         </div>
+<<<<<<< HEAD:library/doc/html/hierarchy.html
         <p><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classitpp_1_1Gamma__RNG.html" target="_self">itpp::Gamma_RNG</a></p>
+=======
+>>>>>>> doc:library/doc/html/hierarchy.html
         <p><img src="ftv2pnode.png" alt="o" width=16 height=22 onclick="toggleFolder('folder4', this)"/><img src="ftv2folderclosed.png" alt="+" width=24 height=22 onclick="toggleFolder('folder4', this)"/><a class="el" href="classbdm_1_1KalmanFull.html" target="_self">bdm::KalmanFull</a></p>
         <div id="folder4">
@@ -265,6 +268,10 @@
             <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1mratio.html" target="_self">bdm::mratio</a></p>
           </div>
+<<<<<<< HEAD:library/doc/html/hierarchy.html
           <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1RV.html" target="_self">bdm::RV</a></p>
           <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1SettingResolver.html" target="_self">bdm::SettingResolver</a></p>
+=======
+          <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1RV.html" target="_self">bdm::RV</a></p>
+>>>>>>> doc:library/doc/html/hierarchy.html
         </div>
         <p><img src="ftv2pnode.png" alt="o" width=16 height=22 onclick="toggleFolder('folder32', this)"/><img src="ftv2folderclosed.png" alt="+" width=24 height=22 onclick="toggleFolder('folder32', this)"/><a class="el" href="classsqmat.html" target="_self">sqmat</a></p>
@@ -279,5 +286,10 @@
           <p><img src="ftv2vertline.png" alt="|" width=16 height=22 /><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1ParticularUI.html" target="_self">bdm::ParticularUI&lt; T &gt;</a></p>
         </div>
+<<<<<<< HEAD:library/doc/html/hierarchy.html
         <p><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1UIException.html" target="_self">bdm::UIException</a></p>
+=======
+        <p><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1UI_1_1SettingResolver.html" target="_self">bdm::UI::UI::SettingResolver</a></p>
+        <p><img src="ftv2node.png" alt="o" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1UIbuildException.html" target="_self">bdm::UIbuildException</a></p>
+>>>>>>> doc:library/doc/html/hierarchy.html
         <p><img src="ftv2lastnode.png" alt="\" width=16 height=22 /><img src="ftv2doc.png" alt="*" width=24 height=22 /><a class="el" href="classbdm_1_1UIFile.html" target="_self">bdm::UIFile</a></p>
       </div>
@@ -286,5 +298,9 @@
 </html>
 </div>
+<<<<<<< HEAD:library/doc/html/hierarchy.html
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:47 2009 for mixpp by&nbsp;
+=======
+<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:50 2009 for mixpp by&nbsp;
+>>>>>>> doc:library/doc/html/hierarchy.html
 <a href="http://www.doxygen.org/index.html">
 <img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address>
