fix removing head and master

This commit is contained in:
Lyn Perrine 2021-10-15 21:02:50 -07:00
parent 5f0f1c44f9
commit a5d1c57093

View File

@ -9,11 +9,7 @@ At the start of the boot process a grub splash screen will be shown. To install
.. image:: grubsplash.png
<<<<<<< HEAD
Once you have booted into the live session, feel free to explore Lubuntu and make sure all your hardware works. Once you are ready to install Lubuntu, double click the icon in the top-left corner of the desktop :guilabel:`Install Lubuntu 21.04`.
=======
Once you have booted into the live session, feel free to explore Lubuntu and make sure all your hardware works. Once you are ready to install Lubuntu, double click the icon in the top-left corner of the desktop :guilabel:`Install Lubuntu 21.10`.
>>>>>>> master
.. image:: live_session.png