From 69dd2852bb2c433b517d89792adb4461a4178aa1 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 9 Aug 2010 22:32:30 +0200
Subject: manager: when two pending jobs conflict, keep the one that
 "conflicts", remove the one that is "conflicted"

This gives the writer of units control which unit is kept and which is
stopped when two units conflict.
---
 fixme | 2 --
 1 file changed, 2 deletions(-)

(limited to 'fixme')

diff --git a/fixme b/fixme
index 765d9d121d..373d100fa6 100644
--- a/fixme
+++ b/fixme
@@ -1,7 +1,5 @@
 * dot output for --test for 'initial description'
 
-* conflicted-by: to have a defined winner for conflicts:
-
 * check 'disable'
   <Viking-Ice>    "Warning: Unit file changed in disk, 'systemctl --system daemon-reload' recomended
   <kay>           when does it do that?
-- 
cgit v1.2.3-54-g00ecf