Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
ebranlard committed Jun 8, 2020
2 parents e2f54dc + d2a89f0 commit 767931b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pydatview/GUITools.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# For log dec tool
from .damping import logDecFromDecay
from .common import CHAR
from .common import CHAR, Error


# --------------------------------------------------------------------------------}
Expand Down

0 comments on commit 767931b

Please sign in to comment.