diff --git a/src/hotfix-conflict-28290737884-1.txt b/src/hotfix-conflict-28290737884-1.txt index 1f5e3ca..8b9eb2b 100644 --- a/src/hotfix-conflict-28290737884-1.txt +++ b/src/hotfix-conflict-28290737884-1.txt @@ -1 +1 @@ -recorded base side of the conflict +trunk drift ahead of the hotfix fix