summaryrefslogtreecommitdiff
path: root/gerbonara/cam.py
diff options
context:
space:
mode:
authorjaseg <git@jaseg.de>2023-02-25 19:43:54 +0100
committerjaseg <git@jaseg.de>2023-02-25 19:43:54 +0100
commit1aaac3936f4d84690b19fd6a40284af35c5b970c (patch)
treeb34eebb7252b245f4e771cf2b373aed342f602b6 /gerbonara/cam.py
parent8b40d15dab376c92b37b0939515e7bdee7b83301 (diff)
downloadgerbonara-1aaac3936f4d84690b19fd6a40284af35c5b970c.tar.gz
gerbonara-1aaac3936f4d84690b19fd6a40284af35c5b970c.tar.bz2
gerbonara-1aaac3936f4d84690b19fd6a40284af35c5b970c.zip
Still more doc
Diffstat (limited to 'gerbonara/cam.py')
-rw-r--r--gerbonara/cam.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gerbonara/cam.py b/gerbonara/cam.py
index 59c4969..9819087 100644
--- a/gerbonara/cam.py
+++ b/gerbonara/cam.py
@@ -357,7 +357,7 @@ class CamFile:
def merge(self, other):
""" Merge ``other`` into ``self``, i.e. add all objects that are in ``other`` to ``self``. This resets
:py:attr:`.import_settings` and :py:attr:`~.CamFile.generator`. Units and other file-specific settings are
- automatically handled.
+ handled automatically.
"""
raise NotImplementedError()