From 1ffba6fe82d65f2a87b53a21c7927bca8176038c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 21 Jan 2010 00:51:37 +0100
Subject: fix job merging

---
 test2/g.service | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 test2/g.service

(limited to 'test2/g.service')

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
-- 
cgit v1.2.3-54-g00ecf