Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/LorenFrankLab/spyglass in…
Browse files Browse the repository at this point in the history
…to dev
  • Loading branch information
CBroz1 committed Feb 29, 2024
2 parents e1b4c1c + 1edf752 commit 5b35a0b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
1 change: 1 addition & 0 deletions src/spyglass/position/v1/position_dlc_pose_estimation.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

from spyglass.common.common_behav import ( # noqa: F401
RawPosition,
VideoFile,
convert_epoch_interval_name_to_position_interval_name,
)
from spyglass.common.common_nwbfile import AnalysisNwbfile
Expand Down
6 changes: 1 addition & 5 deletions src/spyglass/position/v1/position_dlc_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@
import ruamel.yaml

from spyglass.common.common_lab import LabTeam
from spyglass.position.v1.dlc_utils import (
_set_permissions,
check_videofile,
get_video_path,
)
from spyglass.position.v1.dlc_utils import check_videofile, get_video_path
from spyglass.settings import dlc_project_dir, dlc_video_dir
from spyglass.utils.dj_mixin import SpyglassMixin

Expand Down

0 comments on commit 5b35a0b

Please sign in to comment.