| commit | 358a21f2d690d040fe69e2ff7a5573a0d134adf4 | |
| author | afify <hassan@afify.dev> | |
| Thu, 11 Jun 2020 01:07:03 +0000 (11 04:07 +0300) | ||
| committer | afify <hassan@afify.dev> | |
| Thu, 11 Jun 2020 01:07:03 +0000 (11 04:07 +0300) | ||
| tree | aeaed017c418e36cec5d6f3bd3459b3b2c63834c | treesnapshot (tar.gz zip) |
| parent | 8a4a987baa73b875fc6f9d4a57159de1ac719950 | commitdiff |
fix conflict
modified: .config/git/.gitignore
modified: .config/git/config
modified: .config/ksh/kshrc
modified: .config/surf/styles/github.css
modified: .scripts/check_ssh.sh
modified: .scripts/create_bootable_usb.sh
modified: .scripts/create_c_proj.sh
modified: .scripts/create_mnt_dirs.sh
modified: .scripts/deploy_backup.sh
modified: .scripts/hostname.sh
new file: .scripts/linux_issue.txt
modified: .scripts/pkg_base.sh
modified: .scripts/ssh.sh
modified: .scripts/surf_homepage
modified: .scripts/update.sh
modified: .scripts/xbps_base.txt
modified: .config/git/.gitignore
modified: .config/git/config
modified: .config/ksh/kshrc
modified: .config/surf/styles/github.css
modified: .scripts/check_ssh.sh
modified: .scripts/create_bootable_usb.sh
modified: .scripts/create_c_proj.sh
modified: .scripts/create_mnt_dirs.sh
modified: .scripts/deploy_backup.sh
modified: .scripts/hostname.sh
new file: .scripts/linux_issue.txt
modified: .scripts/pkg_base.sh
modified: .scripts/ssh.sh
modified: .scripts/surf_homepage
modified: .scripts/update.sh
modified: .scripts/xbps_base.txt
16 files changed: