FIX: Precomit errors

Author: adamshephard

examples/11-feature-extraction.ipynb

@@ -181,6 +181,7 @@
     "import matplotlib.pyplot as plt\n",
     "import numpy as np\n",
     "import umap\n",
+<<<<<<< HEAD
     "\n",
     "# Import some extra modules\n",
     "from huggingface_hub import notebook_login\n",
@@ -195,6 +196,23 @@
     "from tiatoolbox.utils.misc import download_data\n",
     "from tiatoolbox.wsicore.wsireader import WSIReader\n",
     "\n",
+=======
+    "\n",
+    "# Import some extra modules\n",
+    "from huggingface_hub import notebook_login\n",
+    "\n",
+    "# Data processing and visualization\n",
+    "# TIAToolbox for WSI loading and processing\n",
+    "from tiatoolbox import logger\n",
+    "from tiatoolbox.models.architecture.vanilla import TimmBackbone\n",
+    "from tiatoolbox.models.engine.semantic_segmentor import (\n",
+    "    DeepFeatureExtractor,\n",
+    "    IOSegmentorConfig,\n",
+    ")\n",
+    "from tiatoolbox.utils.misc import download_data\n",
+    "from tiatoolbox.wsicore.wsireader import WSIReader\n",
+    "\n",
+>>>>>>> 817ac3c093548a2c2568a673c795998b4ce139ad
     "mpl.rcParams[\"figure.dpi\"] = 300  # for high resolution figure in notebook\n",
     "mpl.rcParams[\"figure.facecolor\"] = \"white\"  # To make sure text is visible in dark mode"
    ]
@@ -385,7 +403,11 @@
     "    mode=\"wsi\",\n",
     "    ioconfig=wsi_ioconfig,\n",
     "    save_dir=global_save_dir / \"wsi_features\",\n",
+<<<<<<< HEAD
     "    device=\"cuda\" if ON_GPU else \"cpu\",\n",
+=======
+    "    device=\"cuda\" if ON_GPU == True else \"cpu\",\n",
+>>>>>>> 817ac3c093548a2c2568a673c795998b4ce139ad
     ")"
    ]
   },