Index: library/doc/html/classbdm_1_1mgamma.html
===================================================================
--- library/doc/html/classbdm_1_1mgamma.html (revision 396)
+++ library/doc/html/classbdm_1_1mgamma.html (revision 397)
@@ -72,5 +72,9 @@
 <a href="#_details">More...</a>
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mgamma.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_1mgamma.html
 <p>
 
@@ -108,5 +112,5 @@
 <tr><td class="memItemLeft" nowrap align="right" valign="top">virtual vec&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1mpdf.html#f0c1db6fcbb3aae2dd6123884457a367">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="#f0c1db6fcbb3aae2dd6123884457a367"></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="#f0c1db6fcbb3aae2dd6123884457a367"></a><br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top">virtual mat&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1mpdf.html#afe4185b26baeb03688202e254d3b005">samplecond_m</a> (const vec &amp;cond, int N)</td></tr>
 
@@ -161,5 +165,5 @@
 double&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1mgamma.html#b20cf88cca1fe9b0b8f2a412608bfd09">k</a></td></tr>
 
-<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Constant <img class="formulaInl" alt="$k$" src="form_68.png">. <br></td></tr>
+<tr><td class="mdescLeft">&nbsp;</td><td class="mdescRight">Constant <img class="formulaInl" alt="$k$" src="form_76.png">. <br></td></tr>
 <tr><td class="memItemLeft" nowrap align="right" valign="top"><a class="anchor" name="3d95f4dde9214ff6dba265e18af60312"></a><!-- doxytag: member="bdm::mgamma::_beta" ref="3d95f4dde9214ff6dba265e18af60312" args="" -->
 vec &amp;&nbsp;</td><td class="memItemRight" valign="bottom"><a class="el" href="classbdm_1_1mgamma.html#3d95f4dde9214ff6dba265e18af60312">_beta</a></td></tr>
@@ -182,6 +186,11 @@
 Gamma random walk. 
 <p>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mgamma.html
 Mean value, <img class="formulaInl" alt="$\mu$" src="form_67.png">, of this density is given by <code>rvc</code> . Standard deviation of the random walk is proportional to one <img class="formulaInl" alt="$k$" src="form_68.png">-th the mean. This is achieved by setting <img class="formulaInl" alt="$\alpha=k$" src="form_69.png"> and <img class="formulaInl" alt="$\beta=k/\mu$" src="form_70.png">.<p>
 The standard deviation of the walk is then: <img class="formulaInl" alt="$\mu/\sqrt(k)$" src="form_71.png">. <hr><h2>Member Function Documentation</h2>
+=======
+Mean value, <img class="formulaInl" alt="$\mu$" src="form_75.png">, of this density is given by <code>rvc</code> . Standard deviation of the random walk is proportional to one <img class="formulaInl" alt="$k$" src="form_76.png">-th the mean. This is achieved by setting <img class="formulaInl" alt="$\alpha=k$" src="form_77.png"> and <img class="formulaInl" alt="$\beta=k/\mu$" src="form_78.png">.<p>
+The standard deviation of the walk is then: <img class="formulaInl" alt="$\mu/\sqrt(k)$" src="form_79.png">. <hr><h2>Member Function Documentation</h2>
+>>>>>>> doc:library/doc/html/classbdm_1_1mgamma.html
 <a class="anchor" name="da2af0f327e5452bee71d1bf97452ae4"></a><!-- doxytag: member="bdm::mgamma::from_setting" ref="da2af0f327e5452bee71d1bf97452ae4" args="(const Setting &amp;set)" -->
 <div class="memitem">
@@ -209,5 +218,9 @@
 <p>Reimplemented from <a class="el" href="classbdm_1_1mpdf.html#30a0bceb948e287d497c578e371b1667">bdm::mpdf</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mgamma.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#l00693">k</a>, and <a class="el" href="exp__family_8cpp_source.html#l00214">set_parameters()</a>.</p>
+=======
+<p>References <a class="el" href="exp__family_8h-source.html#l00693">k</a>, and <a class="el" href="exp__family_8cpp-source.html#l00214">set_parameters()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1mgamma.html
 
 </div>
@@ -230,5 +243,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>
@@ -240,7 +253,13 @@
 <p>Reimplemented in <a class="el" href="classbdm_1_1mprod.html#ee715a8013acf9892f6cb489db595555">bdm::mprod</a>.</p>
 
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mgamma.html
 <p>References <a class="el" href="bdmbase_8h_source.html#l00376">bdm::mpdf::condition()</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>Referenced by <a class="el" href="particles_8h_source.html#l00207">bdm::MPF&lt; BM_T &gt;::bayes()</a>, <a class="el" href="particles_8cpp_source.html#l00007">bdm::PF::bayes()</a>, and <a class="el" href="datasources_8cpp_source.html#l00043">bdm::ArxDS::step()</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#l00348">bdm::mpdf::ep</a>, and <a class="el" href="bdmbase_8h-source.html#l00263">bdm::epdf::sample()</a>.</p>
+
+<p>Referenced by <a class="el" href="particles_8h-source.html#l00207">bdm::MPF&lt; BM_T &gt;::bayes()</a>, <a class="el" href="particles_8cpp-source.html#l00007">bdm::PF::bayes()</a>, and <a class="el" href="datasources_8cpp-source.html#l00043">bdm::ArxDS::step()</a>.</p>
+>>>>>>> doc:library/doc/html/classbdm_1_1mgamma.html
 
 </div>
@@ -276,17 +295,27 @@
 <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_1mgamma.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_1mgamma.html
 
 </div>
 </div><p>
 <hr>The documentation for this class was generated from the following files:<ul>
+<<<<<<< HEAD:library/doc/html/classbdm_1_1mgamma.html
 <li><a class="el" href="exp__family_8h_source.html">exp_family.h</a><li>exp_family.cpp</ul>
 </div>
 <hr size="1"><address style="text-align: right;"><small>Generated on Wed Jun 24 13:35:56 2009 for mixpp by&nbsp;
+=======
+<li><a class="el" href="exp__family_8h-source.html">exp_family.h</a><li>exp_family.cpp</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_1mgamma.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>
