aboutsummaryrefslogtreecommitdiff
path: root/.xinitrc
diff options
context:
space:
mode:
authorGravatar Jonas Gunz <himself@jonasgunz.de> 2019-10-15 11:23:08 +0200
committerGravatar Jonas Gunz <himself@jonasgunz.de> 2019-10-15 11:23:08 +0200
commitd2a0a8458a1d761c7e6f8fb6d97ab1c317c5211b (patch)
treeceb3dde498bf5161f84e09377afe0ae742e6eca3 /.xinitrc
parentc45fd444fef5b99263c4fe311ff9bead2605ea72 (diff)
downloaddotfiles-d2a0a8458a1d761c7e6f8fb6d97ab1c317c5211b.tar.gz
asdf
Diffstat (limited to '.xinitrc')
-rw-r--r--.xinitrc1
1 files changed, 0 insertions, 1 deletions
diff --git a/.xinitrc b/.xinitrc
index 66d1b5d..f81dc61 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -19,7 +19,6 @@ setterm -blank 0 -powerdown 0
xset s off
#Screen background feh
->>>>>>> Stashed changes
shopt -s nullglob
pics=(~/vimconfig/pictures/b_*)