Resolve merge conflict
This commit is contained in:
parent
3168ed9a00
commit
05f0489b64
1 changed files with 0 additions and 8 deletions
8
archfi
8
archfi
|
@ -12,15 +12,7 @@
|
||||||
# reference : https://wiki.archlinux.org/index.php/Installation_guide
|
# reference : https://wiki.archlinux.org/index.php/Installation_guide
|
||||||
|
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
<<<<<<< HEAD
|
|
||||||
apptitle="Arch Linux Fast Install (archfi) - Version: 2022.10.15.02.11.59 (GPLv3)"
|
|
||||||
=======
|
|
||||||
apptitle="Arch Linux Fast Install (archfi) - Version: 2022.10.15.02.11.59 (GPLv3)"
|
|
||||||
>>>>>>> src
|
|
||||||
=======
|
|
||||||
apptitle="Arch Linux Fast Install (archfi) - Version: 2022.10.15.22.50.30 (GPLv3)"
|
apptitle="Arch Linux Fast Install (archfi) - Version: 2022.10.15.22.50.30 (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"
|
||||||
|
|
Loading…
Reference in a new issue