From d2a0a8458a1d761c7e6f8fb6d97ab1c317c5211b Mon Sep 17 00:00:00 2001
From: Jonas Gunz <himself@jonasgunz.de>
Date: Tue, 15 Oct 2019 11:23:08 +0200
Subject: asdf

---
 .xinitrc | 1 -
 1 file changed, 1 deletion(-)

(limited to '.xinitrc')

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_*)
-- 
cgit v1.2.3