style changes and Merge branch 'master' of https://github.com/ElianVanCutsem/grub2-themes

README.md

@@ -28,6 +28,11 @@ _if no option used the terminal user interface will be show up_
 | -h, --help     | Show this help |
 
 For example:
+<<<<<<< HEAD
+=======
+
+1. `Install Tela theme on 2k display device`
+>>>>>>> 33e88a798b2eae21cf2e923f5df9c2e8388363a3
 
 1. Install Tela theme on 2k display device
 
@@ -43,7 +48,14 @@ For example:
 
 #### Set the right resolution of your display
 
+<<<<<<< HEAD
 On the grub screen, `press c` to get the commandline, and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use, then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it, last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg.
+=======
+On the grub screen, `press c` to get the commandline,
+and enter `vbeinfo` or `videoinfo` on EFI boot to check what resolutions you can use,
+then edit `/etc/default/grub` , add your resolution `GRUB_GFXMODE=****x****x32` into it,
+last you can run `grub-mkconfig -o /boot/grub/grub.cfg` to update your grub.cfg.
+>>>>>>> 33e88a798b2eae21cf2e923f5df9c2e8388363a3
 
 ## Screenshots