Index: library/doc/html/classbdm_1_1euni.html
===================================================================
--- library/doc/html/classbdm_1_1euni.html (revision 396)
+++ library/doc/html/classbdm_1_1euni.html (revision 397)
@@ -72,5 +72,9 @@
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1euni.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_1euni.html
 <p>
 
@@ -89,5 +93,5 @@
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1euni.html#fc5df80359ead2918384b2004ce67194">sample</a> () const </td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a sample, <img class="formulaInl" alt="$ x $" src="form_45.png"> from density <img class="formulaInl" alt="$ f_x()$" src="form_46.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns a sample, <img class="formulaInl" alt="$ x $" src="form_7.png"> from density <img class="formulaInl" alt="$ f_x()$" src="form_8.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="46caa8c13aba2e6228f964208918b226"></a><!-- doxytag: member="bdm::euni::mean" ref="46caa8c13aba2e6228f964208918b226" args="() const " -->
 vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1euni.html#46caa8c13aba2e6228f964208918b226">mean</a> () const </td></tr>
@@ -139,5 +143,5 @@
 virtual mat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1epdf.html#b4cf45fd83cc7573ede9fe1215256058">sample_m</a> (int N) const </td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns N samples, <img class="formulaInl" alt="$ [x_1 , x_2 , \ldots \ $" src="form_47.png"> from density <img class="formulaInl" alt="$ f_x(rv)$" src="form_48.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Returns N samples, <img class="formulaInl" alt="$ [x_1 , x_2 , \ldots \ $" src="form_9.png"> from density <img class="formulaInl" alt="$ f_x(rv)$" src="form_10.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="34956d4dd3176eeb5937cf48a1546b62"></a><!-- doxytag: member="bdm::euni::evallog_m" ref="34956d4dd3176eeb5937cf48a1546b62" args="(const mat &amp;Val) const " -->
 virtual vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1epdf.html#34956d4dd3176eeb5937cf48a1546b62">evallog_m</a> (const mat &amp;Val) const </td></tr>
@@ -235,12 +239,22 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1epdf.html#fa9efc98a065b31c630fe18cc418f725">bdm::epdf</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1euni.html
 <p>References <a class="el" href="user__info_8h_source.html#l00358">bdm::UI::get()</a>, <a class="el" href="exp__family_8h_source.html#l00466">high</a>, and <a class="el" href="exp__family_8h_source.html#l00464">low</a>.</p>
+=======
+<p>References <a class="el" href="exp__family_8h-source.html#l00466">high</a>, and <a class="el" href="exp__family_8h-source.html#l00464">low</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1euni.html
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following file:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1euni.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:55 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_1euni.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>
