Add examples of selecting groups from other groups

* Fixes issue #100 * adds examples of selecting residues from each segment, or atoms from each residue
MDAnalysis · Jan 21, 2022 · 6514248 · 6514248
1 parent fef611e
commit 6514248
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/doc/source/AUTHORS b/doc/source/AUTHORS
@@ -29,4 +29,4 @@ Chronological list of authors
   - Yuxuan Zhuang
   - Mieczyslaw Torchala
 2021
-  - Paul Smith
+  - Paul Smith
diff --git a/doc/source/groups_of_atoms.rst b/doc/source/groups_of_atoms.rst
@@ -139,7 +139,10 @@ Use case: Atoms list grouped by residues
 In order to list all the heavy protein backbone and sidechain atoms in every residue, one needs to call:
 
 .. ipython:: python
+<<<<<<< HEAD
     :okwarning:
+=======
+>>>>>>> 6fbcdd6 (Add examples of selecting groups from other groups)
 
     atoms_in_residues = list()
     for seg in u.segments: