Skip to content

Commit

Permalink
Resolve conflicts in symmetry.md
Browse files Browse the repository at this point in the history
  • Loading branch information
lafita committed Jan 11, 2017
2 parents a85316e + e36df01 commit 931525c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions structure/symmetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@ System.out.println(pg.getSymmetry());
```

To enable some extra features in the display, a `SymmetryDisplay`
class has been created, although the `StrucutreAlignmentDisplay`
and `MultipleAlignmentDisplay` methods can also be used for that
purpose (they will not show symmetry axes or symmetry menus).
class has been created, although the `MultipleAlignmentDisplay` method
can also be used for that purpose (it will not show symmetry axes or
symmetry menus).

Lastly, the `SymmetryGUI` class in the **structure-gui** package
provides a GUI to trigger internal symmetry analysis, equivalent
Expand Down Expand Up @@ -213,7 +213,7 @@ below:

![PDB ID 1VYM](img/symm_combined.png)

This results can give hints about the function and evolution of proteins and biological
These results can give hints about the function and evolution of proteins and biological
structures.

<!--automatically generated footer-->
Expand Down

0 comments on commit 931525c

Please sign in to comment.