diff --git a/config/conflict.txt b/config/conflict.txt index 180b47c..d0a567f 100644 --- a/config/conflict.txt +++ b/config/conflict.txt @@ -1 +1 @@ -baseline +feature selects fixture A