Merge pull request #41 ok

update ref content
bitshares · Sep 27, 2018 · 95090e5 · 95090e5
2 parents 556880b + a622efb
commit 95090e5
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 6 deletions.
diff --git a/docs/_build/doctrees/environment.pickle b/docs/_build/doctrees/environment.pickle
diff --git a/docs/_build/doctrees/references/info_bbf_events.doctree b/docs/_build/doctrees/references/info_bbf_events.doctree
diff --git a/docs/_build/html/_sources/references/info_bbf_events.rst.txt b/docs/_build/html/_sources/references/info_bbf_events.rst.txt
@@ -12,7 +12,6 @@ BitFest Amsterdam 2018
 :Peter Conrad:  `BitShares Core & Network Performance <../_images/presen_docs/BitFest_BTS_Performance.pdf>`_
 :Alfredo Garcia:  `The Business of BitShares Plugins <../_images/presen_docs/BitFest_Business_Plugins.pdf>`_
 :John M. Jones:  Trustless Asset Swaps: BitShares and HTLC
-:Michel Santos:  Life and Times of a BitShares Operation
 :Fabian Schuh:  Escrow Worker Management
 
 

diff --git a/docs/_build/html/objects.inv b/docs/_build/html/objects.inv
diff --git a/docs/_build/html/references/info_bbf_events.html b/docs/_build/html/references/info_bbf_events.html
@@ -198,9 +198,7 @@ <h2>BitFest Amsterdam 2018<a class="headerlink" href="#bitfest-amsterdam-2018" t
 </tr>
 <tr class="field-odd field"><th class="field-name">John M. Jones:</th><td class="field-body">Trustless Asset Swaps: BitShares and HTLC</td>
 </tr>
-<tr class="field-even field"><th class="field-name">Michel Santos:</th><td class="field-body">Life and Times of a BitShares Operation</td>
-</tr>
-<tr class="field-odd field"><th class="field-name">Fabian Schuh:</th><td class="field-body">Escrow Worker Management</td>
+<tr class="field-even field"><th class="field-name">Fabian Schuh:</th><td class="field-body">Escrow Worker Management</td>
 </tr>
 </tbody>
 </table>

diff --git a/docs/_build/html/searchindex.js b/docs/_build/html/searchindex.js
diff --git a/docs/references/info_bbf_events.rst b/docs/references/info_bbf_events.rst
@@ -12,7 +12,6 @@ BitFest Amsterdam 2018
 :Peter Conrad:  `BitShares Core & Network Performance <../_images/presen_docs/BitFest_BTS_Performance.pdf>`_
 :Alfredo Garcia:  `The Business of BitShares Plugins <../_images/presen_docs/BitFest_Business_Plugins.pdf>`_
 :John M. Jones:  Trustless Asset Swaps: BitShares and HTLC
-:Michel Santos:  Life and Times of a BitShares Operation
 :Fabian Schuh:  Escrow Worker Management