From a5d1c57093e76b3f85f8adbf59d520b5b7fe4107 Mon Sep 17 00:00:00 2001 From: Lyn Perrine Date: Fri, 15 Oct 2021 21:02:50 -0700 Subject: [PATCH] fix removing head and master --- source/1/1.3/installation.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/1/1.3/installation.rst b/source/1/1.3/installation.rst index a4fea0f4..65ee3bf5 100644 --- 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