Index: library/doc/html/classbdm_1_1mprod.html
===================================================================
--- library/doc/html/classbdm_1_1mprod.html (revision 396)
+++ library/doc/html/classbdm_1_1mprod.html (revision 397)
@@ -103,5 +103,5 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1mprod.html#ee715a8013acf9892f6cb489db595555">samplecond</a> (const vec &amp;cond)</td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a sample from the density conditioned on <code>cond</code>, <img class="formulaInl" alt="$x \sim epdf(rv|cond)$" src="form_49.png">.  <a href="#ee715a8013acf9892f6cb489db595555"></a><br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a sample from the density conditioned on <code>cond</code>, <img class="formulaInl" alt="$x \sim epdf(rv|cond)$" src="form_11.png">.  <a href="#ee715a8013acf9892f6cb489db595555"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="d193dcc89fbc6f21979e0ced6d84568c"></a><!-- doxytag: member="bdm::mprod::samplecond" ref="d193dcc89fbc6f21979e0ced6d84568c" args="(const vec &amp;cond, int N)" -->
 mat&nbsp;</td><td class="memItemRight" valign="bottom"><b>samplecond</b> (const vec &amp;cond, int N)</td></tr>
@@ -225,6 +225,9 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1mpdf.html#30a0bceb948e287d497c578e371b1667">bdm::mpdf</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mprod.html
 <p>References <a class="el" href="user__info_8h_source.html#l00358">bdm::UI::get()</a>.</p>
 
+=======
+>>>>>>> doc:library/doc/html/classbdm_1_1mprod.html
 </div>
 </div><p>
@@ -254,7 +257,13 @@
 </dl>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mprod.html
 <p>References <a class="el" href="bdmbase_8cpp_source.html#l00078">bdm::RV::add()</a>, and <a class="el" href="bdmbase_8h_source.html#l00639">bdm::compositepdf::mpdfs</a>.</p>
 
 <p>Referenced by <a class="el" href="merger_8h_source.html#l00081">bdm::merger_base::set_sources()</a>.</p>
+=======
+<p>References <a class="el" href="bdmbase_8cpp-source.html#l00078">bdm::RV::add()</a>, and <a class="el" href="bdmbase_8h-source.html#l00639">bdm::compositepdf::mpdfs</a>.</p>
+
+<p>Referenced by <a class="el" href="merger_8h-source.html#l00081">bdm::merger_base::set_sources()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1mprod.html
 
 </div>
@@ -277,5 +286,5 @@
 
 <p>
-Returns a sample from the density conditioned on <code>cond</code>, <img class="formulaInl" alt="$x \sim epdf(rv|cond)$" src="form_49.png">. 
+Returns a sample from the density conditioned on <code>cond</code>, <img class="formulaInl" alt="$x \sim epdf(rv|cond)$" src="form_11.png">. 
 <p>
 <dl compact><dt><b>Parameters:</b></dt><dd>
@@ -289,5 +298,9 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1mpdf.html#f0c1db6fcbb3aae2dd6123884457a367">bdm::mpdf</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mprod.html
 <p>References <a class="el" href="bdmbase_8h_source.html#l00318">bdm::epdf::dimension()</a>, <a class="el" href="emix_8h_source.html#l00229">dls</a>, <a class="el" href="bdmbase_8h_source.html#l00348">bdm::mpdf::ep</a>, <a class="el" href="emix_8h_source.html#l00227">epdfs</a>, and <a class="el" href="bdmbase_8h_source.html#l00639">bdm::compositepdf::mpdfs</a>.</p>
+=======
+<p>References <a class="el" href="bdmbase_8h-source.html#l00318">bdm::epdf::dimension()</a>, <a class="el" href="emix_8h-source.html#l00229">dls</a>, <a class="el" href="bdmbase_8h-source.html#l00348">bdm::mpdf::ep</a>, <a class="el" href="emix_8h-source.html#l00227">epdfs</a>, and <a class="el" href="bdmbase_8h-source.html#l00639">bdm::compositepdf::mpdfs</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1mprod.html
 
 </div>
@@ -323,10 +336,14 @@
 <dl compact><dt><b>Parameters:</b></dt><dd>
   <table border="0" cellspacing="2" cellpadding="0">
-    <tr><td valign="top"></td><td valign="top"><em>N</em>&nbsp;</td><td>samples from the density conditioned on <code>cond</code>, <img class="formulaInl" alt="$x \sim epdf(rv|cond)$" src="form_49.png">. </td></tr>
+    <tr><td valign="top"></td><td valign="top"><em>N</em>&nbsp;</td><td>samples from the density conditioned on <code>cond</code>, <img class="formulaInl" alt="$x \sim epdf(rv|cond)$" src="form_11.png">. </td></tr>
     <tr><td valign="top"></td><td valign="top"><em>cond</em>&nbsp;</td><td>is numeric value of <code>rv</code> </td></tr>
   </table>
 </dl>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mprod.html
 <p>References <a class="el" href="bdmbase_8h_source.html#l00376">bdm::mpdf::condition()</a>, <a class="el" href="bdmbase_8h_source.html#l00318">bdm::epdf::dimension()</a>, <a class="el" href="bdmbase_8h_source.html#l00348">bdm::mpdf::ep</a>, and <a class="el" href="bdmbase_8h_source.html#l00263">bdm::epdf::sample()</a>.</p>
+=======
+<p>References <a class="el" href="bdmbase_8h-source.html#l00376">bdm::mpdf::condition()</a>, <a class="el" href="bdmbase_8h-source.html#l00318">bdm::epdf::dimension()</a>, <a class="el" href="bdmbase_8h-source.html#l00348">bdm::mpdf::ep</a>, and <a class="el" href="bdmbase_8h-source.html#l00263">bdm::epdf::sample()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1mprod.html
 
 </div>
@@ -335,5 +352,9 @@
 <li><a class="el" href="emix_8h_source.html">emix.h</a></ul>
 </div>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mprod.html
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:52 2009 for mixpp by&nbsp;
+=======
+<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_1mprod.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>
