ouroboros-gorup/obos-fi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve merge conflict

Browse source
This commit is contained in:
MatMoul 2019-01-10 23:12:03 +01:00
parent ac2bcaec57
commit 5f0023b6b4
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archfi
View file

@ -12,11 +12,7 @@
# referance : https://wiki.archlinux.org/index.php/Installation_guide # 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)" apptitle="Arch Linux Fast Install (archfi) - Version: 2019.01.10.23.04.13 (GPLv3)"
>>>>>>> src
baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master
skipfont="0" skipfont="0"