Skip to content

Commit

Permalink
Merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
yck011522 committed Apr 19, 2024
1 parent bb847f7 commit a809746
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/compas_fab/robots/time_.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ class Duration(Data):
Parameters
----------
secs: int or float
secs : :obj:`int` or :obj:`float`
Integer representing number of seconds.
If a float is passed, the integer portion is assigned to secs and
the decimal portion of the secs variable is converted and added to nsecs.
nsecs: int
nsecs : :obj:`int`
Integer representing number of nanoseconds.
Attributes
----------
seconds: float, read-only
seconds : :obj:`float`, read-only
Returns the total duration as floating-point seconds.
secs: int or float
secs : :obj:`int` or :obj:`float`
Float representing number of seconds.
nsecs: int
nsecs : :obj:`int`
Integer representing number of nanoseconds.
Examples
Expand Down

0 comments on commit a809746

Please sign in to comment.