cleared merge conflict

kuibit/cactus_grid_functions.py

@@ -29,23 +29,15 @@
   object with keys the possible dimensions (e.g., ``x``, ``yz``, ``xyz``).
 - :py:class`~.AllGridFunctions` takes all the files in SimDir and sort them
   according the different grid functions they contain.
-<<<<<<< HEAD
-- There are two :py:class`~.OneGridFunction` classes, one for HDF5 files and one
-  for ASCII files. They describe one single grid function and they contains the
-  files associated to that grid function. Both the classes are derived from the
-  same abstract base class :py:class`~.OneGridFunctionBase`, which implements
-  the shared methods.
-=======
 - There are three :py:class`~.OneGridFunction` classes, one for HDF5 files, one
   for ASCII files, and one for OpenPMD files. They describe one single grid
   function and they contains the files associated to that grid function. Both
   the classes are derived from the same abstract base class
   :py:class`~.OneGridFunctionBase`, which implements the shared methods.
->>>>>>> WIP: Add support for reading OpenPMD files
-These are hierarchical classes, one containing the others, so one typically ends
-up with a series of brackets to access the actual data. For example, if ``sim``
-is a :py:class:`~.SimDir`, ``sim.gf.xy['rho_b'][0]`` is ``rho_b`` at iteration 0
-on the equatorial plane represented as :py:class:`~.HierarchicalGridData`.
+  These are hierarchical classes, one containing the others, so one typically ends
+  up with a series of brackets to access the actual data. For example, if ``sim``
+  is a :py:class:`~.SimDir`, ``sim.gf.xy['rho_b'][0]`` is ``rho_b`` at iteration
+  on the equatorial plane represented as :py:class:`~.HierarchicalGridData`.
 
 """