Fix merge wierdness

source/4/4.1/discover.rst

@@ -15,7 +15,6 @@ To view more information on a program you want to install left click on a progra
 
 .. image:: update-authentication.png
 
-=======
 .. image:: discover-details.png
 
 

source/F/keyboard_shortcuts.rst

@@ -105,8 +105,7 @@ ToggleFullscreen              F11
 
 ============================= ========================
 
-<<<<<<< HEAD
-=======
+
 ============================= ========================
 
 GoToLeftDesktop               C-A-Left
@@ -230,7 +229,8 @@ Open pcmanfm-qt               XF86MyComputer
 **Keybinding for backlight**
 
 ============================= ========================
-
+<<<<<<< HEAD
+=======
 Toggle turn off monitor       C-F7
 
 Decrease backlight brightness C-S-F6