Index: library/doc/html/classbdm_1_1multiBM.html
===================================================================
--- library/doc/html/classbdm_1_1multiBM.html (revision 397)
+++ library/doc/html/classbdm_1_1multiBM.html (revision 398)
@@ -5,5 +5,5 @@
 <link href="doxygen.css" rel="stylesheet" type="text/css">
 </head><body>
-<!-- Generated by Doxygen 1.5.9 -->
+<!-- Generated by Doxygen 1.5.8 -->
 <script type="text/javascript">
 <!--
@@ -72,9 +72,5 @@
 <a href="#_details">More...</a>
 <p>
-<<<<<<< HEAD:library/doc/html/classbdm_1_1multiBM.html
-<code>#include &lt;<a class="el" href="exp__family_8h_source.html">exp_family.h</a>&gt;</code>
-=======
 <code>#include &lt;<a class="el" href="exp__family_8h-source.html">exp_family.h</a>&gt;</code>
->>>>>>> doc:library/doc/html/classbdm_1_1multiBM.html
 <p>
 
@@ -267,9 +263,5 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1BMEF.html#c287f4c0c1ea31b91572ec45351838f1">bdm::BMEF</a>.</p>
 
-<<<<<<< HEAD:library/doc/html/classbdm_1_1multiBM.html
-<p>References <a class="el" href="exp__family_8h_source.html#l00307">beta</a>, <a class="el" href="exp__family_8h_source.html#l00305">est</a>, <a class="el" href="bdmbase_8h_source.html#l00739">bdm::BM::evalll</a>, <a class="el" href="exp__family_8h_source.html#l00085">bdm::BMEF::frg</a>, <a class="el" href="exp__family_8h_source.html#l00087">bdm::BMEF::last_lognc</a>, <a class="el" href="bdmbase_8h_source.html#l00737">bdm::BM::ll</a>, and <a class="el" href="exp__family_8h_source.html#l00285">bdm::eDirich::lognc()</a>.</p>
-=======
 <p>References <a class="el" href="exp__family_8h-source.html#l00307">beta</a>, <a class="el" href="exp__family_8h-source.html#l00305">est</a>, <a class="el" href="bdmbase_8h-source.html#l00739">bdm::BM::evalll</a>, <a class="el" href="exp__family_8h-source.html#l00085">bdm::BMEF::frg</a>, <a class="el" href="exp__family_8h-source.html#l00087">bdm::BMEF::last_lognc</a>, <a class="el" href="bdmbase_8h-source.html#l00737">bdm::BM::ll</a>, and <a class="el" href="exp__family_8h-source.html#l00285">bdm::eDirich::lognc()</a>.</p>
->>>>>>> doc:library/doc/html/classbdm_1_1multiBM.html
 
 </div>
@@ -295,24 +287,14 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1BM.html#50257e0c1e5b5c73153ea6e716ad8ae0">bdm::BM</a>.</p>
 
-<<<<<<< HEAD:library/doc/html/classbdm_1_1multiBM.html
-<p>References <a class="el" href="exp__family_8h_source.html#l00296">bdm::eDirich::_beta()</a>, <a class="el" href="exp__family_8h_source.html#l00307">beta</a>, <a class="el" href="exp__family_8h_source.html#l00305">est</a>, <a class="el" href="bdmbase_8h_source.html#l00739">bdm::BM::evalll</a>, <a class="el" href="exp__family_8h_source.html#l00085">bdm::BMEF::frg</a>, <a class="el" href="exp__family_8h_source.html#l00087">bdm::BMEF::last_lognc</a>, and <a class="el" href="exp__family_8h_source.html#l00285">bdm::eDirich::lognc()</a>.</p>
-=======
 <p>References <a class="el" href="exp__family_8h-source.html#l00296">bdm::eDirich::_beta()</a>, <a class="el" href="exp__family_8h-source.html#l00307">beta</a>, <a class="el" href="exp__family_8h-source.html#l00305">est</a>, <a class="el" href="bdmbase_8h-source.html#l00739">bdm::BM::evalll</a>, <a class="el" href="exp__family_8h-source.html#l00085">bdm::BMEF::frg</a>, <a class="el" href="exp__family_8h-source.html#l00087">bdm::BMEF::last_lognc</a>, and <a class="el" href="exp__family_8h-source.html#l00285">bdm::eDirich::lognc()</a>.</p>
->>>>>>> doc:library/doc/html/classbdm_1_1multiBM.html
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following file:<ul>
-<<<<<<< HEAD:library/doc/html/classbdm_1_1multiBM.html
-<li><a class="el" href="exp__family_8h_source.html">exp_family.h</a></ul>
-</div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:54 2009 for mixpp by&nbsp;
-=======
 <li><a class="el" href="exp__family_8h-source.html">exp_family.h</a></ul>
 </div>
-<hr size="1"><address style="text-align: right;"><small>Generated on Tue Jun 23 19:52:54 2009 for mixpp by&nbsp;
->>>>>>> doc:library/doc/html/classbdm_1_1multiBM.html
+<hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 21:53:05 2009 for mixpp by&nbsp;
 <a href="http://www.doxygen.org/index.html">
-<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.9 </small></address>
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> 1.5.8 </small></address>
 </body>
 </html>
