Resolve merge conflict

This commit is contained in:
MatMoul 2022-10-15 22:46:01 +02:00
parent 1d1e16e259
commit d1c9a8db56

4
archfi
View file

@ -12,11 +12,7 @@
# reference : https://wiki.archlinux.org/index.php/Installation_guide # reference : https://wiki.archlinux.org/index.php/Installation_guide
<<<<<<< HEAD
apptitle="Arch Linux Fast Install (archfi) - Version: 2022.10.15.01.49.35 (GPLv3)"
=======
apptitle="Arch Linux Fast Install (archfi) - Version: 2022.10.15.01.55.09 (GPLv3)" apptitle="Arch Linux Fast Install (archfi) - Version: 2022.10.15.01.55.09 (GPLv3)"
>>>>>>> src
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
cpl=0 cpl=0
skipfont="0" skipfont="0"