fix merge

Author: TomDonoghue

specparam/plts/style.py

@@ -250,7 +250,7 @@ def style_plot(func, *args, **kwargs):
 
     To see the full set of style arguments that are supported, run the following code:
 
-    >>> from fooof.plts.style import check_style_options
+    >>> from specparam.plts.style import check_style_options
     >>> check_style_options()
     Valid style arguments:
         Axis          title, xlabel, ylabel, xlim, ylim, xticks, yticks, xticklabels, yticklabels

specparam/tests/data/test_data.py

@@ -27,7 +27,7 @@ def test_spectrum_meta_data():
     for field in OBJ_DESC['meta_data']:
         assert getattr(meta_data, field)
 
-def test_fooof_run_modes():
+def test_model_run_modes():
 
     run_modes = ModelRunModes(True, True, True)
     assert run_modes