1 files changed, 0 insertions, 2 deletions
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?