Documents for parallel analysis (#102)

* Fixes #93 * Adds tutorials on various ways to do analysis in parallel
MDAnalysis · Jan 21, 2022 · ef35e44 · ef35e44
1 parent 98e253f
commit ef35e44
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/doc/source/examples/analysis/README.rst b/doc/source/examples/analysis/README.rst
@@ -52,5 +52,8 @@ them separately, e.g.::
 .. include:: /examples/analysis/reduced_dimensions/README.rst
 
 .. include:: /examples/analysis/polymers_and_membranes/README.rst
+<<<<<<< HEAD
 
 .. include:: /examples/analysis/hydrogen_bonds/README.rst
+=======
+>>>>>>> 6be2e24 (Documents for parallel analysis (#102))