Resolve merge conflict
This commit is contained in:
parent
ac2bcaec57
commit
5f0023b6b4
1 changed files with 0 additions and 4 deletions
4
archfi
4
archfi
|
@ -12,11 +12,7 @@
|
|||
# referance : https://wiki.archlinux.org/index.php/Installation_guide
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
apptitle="Arch Linux Fast Install (archfi) - Version: 2019.01.01.20.34.17 (GPLv3)"
|
||||
=======
|
||||
apptitle="Arch Linux Fast Install (archfi) - Version: 2019.01.10.23.04.13 (GPLv3)"
|
||||
>>>>>>> src
|
||||
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
|
||||
skipfont="0"
|
||||
|
||||
|
|
Loading…
Reference in a new issue