hoomd
=====

.. rubric:: Overview

.. py:currentmodule:: hoomd

.. autosummary::
    :nosignatures:

    Box
    CustomAction
    Logger
    Operations
    Simulation
    Snapshot
    State
    _CustomOperation
>>>>>>> feature/new-object-API

.. rubric:: Details

.. automodule:: hoomd
    :synopsis: HOOMD-blue main package.
    :undoc-members:
    :imported-members:
    :members: Simulation,
              State,
              Snapshot,
              Operations,
              Box,
              Logger,
              CustomAction,
              _CustomOperation

.. autoclass:: CustomAction
   :exclude-members: flags, log_quantities
   :members: attach, detach, act

.. rubric:: Modules

.. toctree::
   :maxdepth: 3

   module-hoomd-analyze
   module-hoomd-cite
   module-hoomd-comm
   module-hoomd-compute
   module-hoomd-device
   module-hoomd-dump
   module-hoomd-filter
   module-hoomd-triggers
   module-hoomd-update
   module-hoomd-util
   module-hoomd-variant
   hoomd-misc

hoomd
=====

.. rubric:: Overview

.. py:currentmodule:: hoomd

.. autosummary::
    :nosignatures:

    Box
    CustomAction
    Logger
    Operations
    Simulation
    Snapshot
    State
    _CustomOperation

.. rubric:: Details

.. automodule:: hoomd
    :synopsis: HOOMD-blue main package.
    :undoc-members:
    :imported-members:
    :members: Simulation,
              State,
              Snapshot,
              Operations,
              Box,
              Logger,
              CustomAction,
              _CustomOperation

.. autoclass:: CustomAction
   :exclude-members: flags, log_quantities
   :members: attach, detach, act

.. rubric:: Modules

.. toctree::
   :maxdepth: 3

   module-hoomd-analyze
   module-hoomd-cite
   module-hoomd-comm
   module-hoomd-compute
   module-hoomd-device
   module-hoomd-dump
   module-hoomd-filter
   module-hoomd-triggers
   module-hoomd-update
   module-hoomd-util
   module-hoomd-variant
   hoomd-misc

Remove reminant of merge conflict
Remove reminant of merge conflict
