summaryrefslogtreecommitdiffstats
path: root/projectroot
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-11 15:04:30 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:21:53 +0200
commit9a05cb5d4e6866b4339edd9a5e5c8cdb1427d368 (patch)
tree545b985f52518ad426bb457c7bd4ce0ae34129b8 /projectroot
parent297f8570c65b55140d55870040fd8846ca0993ba (diff)
downloadptxdist-9a05cb5d4e6866b4339edd9a5e5c8cdb1427d368.tar.gz
ptxdist-9a05cb5d4e6866b4339edd9a5e5c8cdb1427d368.tar.xz
alfred: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r--projectroot/usr/lib/systemd/system/alfred@.service (renamed from projectroot/lib/systemd/system/alfred@.service)0
-rw-r--r--projectroot/usr/lib/systemd/system/batadv-vis@.service (renamed from projectroot/lib/systemd/system/batadv-vis@.service)0
2 files changed, 0 insertions, 0 deletions
diff --git a/projectroot/lib/systemd/system/alfred@.service b/projectroot/usr/lib/systemd/system/alfred@.service
index 08e014c41..08e014c41 100644
--- a/projectroot/lib/systemd/system/alfred@.service
+++ b/projectroot/usr/lib/systemd/system/alfred@.service
diff --git a/projectroot/lib/systemd/system/batadv-vis@.service b/projectroot/usr/lib/systemd/system/batadv-vis@.service
index 39b4b6f34..39b4b6f34 100644
--- a/projectroot/lib/systemd/system/batadv-vis@.service
+++ b/projectroot/usr/lib/systemd/system/batadv-vis@.service