summaryrefslogtreecommitdiff
path: root/.config/systemd/user/xresources-dpi@.service
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-02-28 02:43:52 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-02-28 02:43:52 -0500
commit95c15eba4ade7e34ea38890417e818799d358261 (patch)
tree0b2aad15e997e730949dd7fa1deb963f166923e2 /.config/systemd/user/xresources-dpi@.service
parentb82d5f31db3694862bf778d3baf363bda0e580b4 (diff)
parent0ebf8c63b0fa3bf3a20eb6e4272290bd0044dbaf (diff)
Merge remote-tracking branch 'origin/master' into build64-par/master
Diffstat (limited to '.config/systemd/user/xresources-dpi@.service')
-rw-r--r--.config/systemd/user/xresources-dpi@.service2
1 files changed, 1 insertions, 1 deletions
diff --git a/.config/systemd/user/xresources-dpi@.service b/.config/systemd/user/xresources-dpi@.service
index 82f2096..0aa2c75 100644
--- a/.config/systemd/user/xresources-dpi@.service
+++ b/.config/systemd/user/xresources-dpi@.service
@@ -3,7 +3,7 @@ Description=Set the X Resources DataBase DPI to match the display DPI on X displ
Documentation=man:xrdb(1)
Before=X11@%i.target
Requisite=X11@%i.target
-Conflicts=xresources@:i.service
+Conflicts=xresources@:i.service # don't run concurrently with another run of xrdb
[Service]
Environment=DISPLAY=%I