From 36ed0c5e922b39a39ce7933e379e4f3061816c32 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Thu, 14 Jul 2016 08:16:16 -0400
Subject: Fix merge conflict.

---
 xsession | 1 -
 1 file changed, 1 deletion(-)

diff --git a/xsession b/xsession
index 3676ce5..92f6aff 100755
--- a/xsession
+++ b/xsession
@@ -17,5 +17,4 @@ trayer --edge top --align right --SetDockType true --SetPartialStrut true --expa
   xinput set-prop "TPPS/2 IBM TrackPoint" "Device Accel Constant Deceleration" 0.5
 [[ -f /etc/nixos/configuration.nix ]] || \
   redshift -l 40:-70 -r -t 5500:3700 &
->>>>>>> 6b008fdd447ba2ce12af6fe39d5697155aa5a8a2
 exec xmonad
-- 
cgit v1.2.3