fixed merge conflict in snip from 100315b057

2019-09-26 15:14:46 -07:00 · 2019-09-26 15:14:46 -07:00 · 2bba7b0c57
commit 2bba7b0c57
parent 100315b057 75a40816e5
2 changed files with 1 additions and 8 deletions
--- a/8
+++ b/8
@ -1,8 +0,0 @@
 #!/bin/sh
 # This is only here because my xserver is rarted
 # in other words i setup my own rice every login by hand :(
 newbg
 bright 60
 compton -b
--- a/readme.md
+++ b/readme.md
@ -30,3 +30,4 @@ usbm 3
 Wifi 2
 * Get some kind of security for network configs
 * Alternative wrapper for nmcli would also be nice