Skip to content

Commit

Permalink
Merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@pssatapathy-oracle @brenns10
pssatapathy-oracle authored and brenns10 committed Nov 8, 2023
1 parent d84f55b commit 22d287c
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions doc/api.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,14 @@ drgn_tools.rds
.. automodule:: drgn_tools.rds
:members:


drgn_tools.cpuinfo
-----------------------

.. automodule:: drgn_tools.cpuinfo
:members:


drgn_tools.cmdline
-----------------------

Expand Down

0 comments on commit 22d287c

Please sign in to comment.