summaryrefslogtreecommitdiff
path: root/test2
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-01-21 00:51:37 +0100
committerLennart Poettering <lennart@poettering.net>2010-01-21 00:51:37 +0100
commit1ffba6fe82d65f2a87b53a21c7927bca8176038c (patch)
treea7e25b779085247caa54b1e9ee8424f98e4c44bb /test2
parent9ea024f6b5a9626ddabeb4c4d4385481b52d211e (diff)
fix job merging
Diffstat (limited to 'test2')
-rw-r--r--test2/g.service3
1 files changed, 3 insertions, 0 deletions
diff --git a/test2/g.service b/test2/g.service
new file mode 100644
index 0000000000..e811e6083d
--- /dev/null
+++ b/test2/g.service
@@ -0,0 +1,3 @@
+[Meta]
+Description=G
+Conflicts=e.service