diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-07-14 08:16:16 -0400 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-07-14 08:16:16 -0400 |
| commit | 36ed0c5e922b39a39ce7933e379e4f3061816c32 (patch) | |
| tree | 45572267f52ce198073a3c93a10fcb3090a9f802 /xsession | |
| parent | 8217f3a24953b2555a18b94acf75846d65c4988d (diff) | |
Fix merge conflict.
Diffstat (limited to 'xsession')
| -rwxr-xr-x | xsession | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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 |