Skip to content

Conversation

@larsoner
Copy link
Member

Closes #11042

@larsoner larsoner added this to the 1.2 milestone Sep 17, 2022
@larsoner
Copy link
Member Author

@drammock feel free to merge if you're happy, the failure is just #11183

Copy link
Member

@agramfort agramfort left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you have a conflict though

@drammock drammock enabled auto-merge (squash) September 21, 2022 16:34
@hoechenberger hoechenberger enabled auto-merge (squash) September 21, 2022 17:33
@hoechenberger hoechenberger merged commit 706aea1 into mne-tools:main Sep 21, 2022
larsoner added a commit to alexrockhill/mne-python that referenced this pull request Sep 28, 2022
* upstream/main:
  MAINT: Fix CircleCI error (mne-tools#11205) [circle deploy]
  Add regression-based approach to removing EOG artifacts (mne-tools#11046)
  [DOC, MRG] Minor documentation improvements and remove glossary entry for array-like (mne-tools#11207)
  Fix `include_tmax` not considered in `mne.io.Raw.crop` to check `tmax` in bounds (mne-tools#11204)
  MAINT: Fix notebook backend (mne-tools#11206)
  MRG: Fix displayed Raw duration in Jupyter notebook (mne-tools#11203)
  add EpochsSpectrum.average() (mne-tools#11198)
  reduce memory [circle deploy] (mne-tools#11199)
  [BUG, MRG] Fix bug in find_bads_muscle (mne-tools#11197)
  BUG: Fix bug with long legend labels (mne-tools#11181)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Simplify auto legend from evoked. comment in plot_compare_evokeds

4 participants