local merge to fix conflicts

Author: TomDonoghue

Python/01-IndividualPSD.ipynb

@@ -650,13 +650,6 @@
     "print('Average freq-by-freq error:\\t {:1.3f}'.format(np.mean(errs_fm)))\n",
     "print('FOOOF model fit error: \\t\\t {:1.3f}'.format(fm.error_))"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
@@ -675,7 +668,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.8.5"
+   "version": "3.8.3"
   }
  },
  "nbformat": 4,