diff options
| author | MatMoul <matmoul@gmail.com> | 2019-02-02 23:04:21 +0100 |
|---|---|---|
| committer | MatMoul <matmoul@gmail.com> | 2019-02-02 23:04:21 +0100 |
| commit | 5d35a2dccac3c10089e25a8c4ba9ec0736d36922 (patch) | |
| tree | 3b435627aa82d4ce707ebac5a951a8c4f855c22c | |
| parent | a8d03f6043adf8068e3d51cc54225ab6d30d0847 (diff) | |
| download | hyperfi-5d35a2dccac3c10089e25a8c4ba9ec0736d36922.tar.lz hyperfi-5d35a2dccac3c10089e25a8c4ba9ec0736d36922.tar.xz hyperfi-5d35a2dccac3c10089e25a8c4ba9ec0736d36922.zip | |
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.02.02.22.57.49 (GPLv3)" -======= -apptitle="Arch Linux Fast Install (archfi) - Version: 2019.02.02.22.57.49 (GPLv3)" ->>>>>>> src baseurl=https://raw.githubusercontent.com/MatMoul/archfi/master skipfont="0" |