rebase 2

Signed-off-by: angelinalg <[email protected]>
angelinalg · Sep 11, 2023 · 6991189 · 6991189
1 parent 1f37f18
commit 6991189
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/doc/source/train/examples/lightning/lightning_mnist_example.ipynb b/doc/source/train/examples/lightning/lightning_mnist_example.ipynb
@@ -51,11 +51,7 @@
  "source": [
  "## Prepare a dataset and module\n",
  "\n",
-<<<<<<< HEAD
- "The Pytorch Lightning Trainer takes either `torch.utils.data.DataLoader` or `pl.LightningDataModule` as data inputs. You can continue using them without any changes for the Ray Train LightningTrainer. "
-=======
  "The Pytorch Lightning Trainer takes either `torch.utils.data.DataLoader` or `pl.LightningDataModule` as data inputs. You can keep using them without any changes with Ray Train. "
->>>>>>> master
  ]
  },
  {