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_*)