fix removing head and master

3 years ago · a5d1c57093
parent 5f0f1c44f9
commit a5d1c57093
1 changed files with 0 additions and 4 deletions
--- a/source/1/1.3/installation.rst
+++ b/source/1/1.3/installation.rst
@ -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