fusion: merge of associative iterators/views and the new fold interface

[SVN r58618]

doc/html/fusion/container/conversion.html

@@ -3,7 +3,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Conversion</title>
 <link rel="stylesheet" href="../../../../../../doc/html/boostbook.css" type="text/css">
+<<<<<<< .working
 <meta name="generator" content="DocBook XSL Stylesheets V1.65.1">
+=======
+<meta name="generator" content="DocBook XSL Stylesheets V1.75.1">
+>>>>>>> .merge-right.r57125
 <link rel="home" href="../../index.html" title="Chapter 1. Fusion 2.0">
 <link rel="up" href="../container.html" title="Container">
 <link rel="previous" href="generation/metafunctions/map_tie.html" title="map_tie">
@@ -37,10 +41,17 @@
         All fusion sequences can be converted to one of the <a href="../container.html" title="Container">Container</a>
         types using one of these conversion functions.
       </p>
+<<<<<<< .working
 <a name="fusion.container.conversion.header"></a><h4>
 <a name="id511157"></a>
         <a href="conversion.html#fusion.container.conversion.header">Header</a>
       </h4>
+=======
+<a name="fusion.container.conversion.header"></a><h5>
+<a name="id717528"></a>
+        <a class="link" href="conversion.html#fusion.container.conversion.header">Header</a>
+      </h5>
+>>>>>>> .merge-right.r57125
 <pre class="programlisting"><span class="preprocessor">#include</span> <span class="special">&lt;</span><span class="identifier">boost</span><span class="special">/</span><span class="identifier">fusion</span><span class="special">/</span><span class="identifier">include</span><span class="special">/</span><span class="identifier">convert</span><span class="special">.</span><span class="identifier">hpp</span><span class="special">&gt;</span>
 </pre>
 </div>