Missed a conflict. - dotfiles - Unnamed repository; edit this file 'description… | |
Log | |
Files | |
Refs | |
README | |
--- | |
commit 4621b3a9fe6f615d0d38a38a0e7df12612115c8b | |
parent 5802638c7f5f6c38cf9b62c8de34e32cd24a6e41 | |
Author: Jay Scott <[email protected]> | |
Date: Sun, 18 Jun 2023 11:26:05 +0100 | |
Missed a conflict. | |
Diffstat: | |
M README | 5 ----- | |
1 file changed, 0 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/README b/README | |
@@ -17,12 +17,7 @@ at all, the closest I come is using IRC. | |
email : mutt / fdm | |
browser : qutebrowser | |
video : mpv | |
-<<<<<<< HEAD | |
music : moc | |
-======= | |
- music : cmus | |
- gaming : scummvm | |
->>>>>>> 5ecfc9b94f8a19c3bd7230e3d3a25c39b4f277e4 | |
password mgt : pass | |
vpn : mullvad | |
news : sfeed |