diff options
| author | MatMoul <matmoul@gmail.com> | 2019-01-10 23:12:03 +0100 |
|---|---|---|
| committer | MatMoul <matmoul@gmail.com> | 2019-01-10 23:12:03 +0100 |
| commit | 5f0023b6b4ae8f8c24b80db804e3455a6f6818e1 (patch) | |
| tree | d569c5c640623ba0189389dc2f811a9794e23900 | |
| parent | ac2bcaec57be46d68b772fc431f89bccc4565f16 (diff) | |
| download | hyperfi-5f0023b6b4ae8f8c24b80db804e3455a6f6818e1.tar.lz hyperfi-5f0023b6b4ae8f8c24b80db804e3455a6f6818e1.tar.xz hyperfi-5f0023b6b4ae8f8c24b80db804e3455a6f6818e1.zip | |
Resolve merge conflict
| -rw-r--r-- | archfi | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -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" |