diff --git a/CONFLICT.md b/CONFLICT.md index 852ef55..9b61d8e 100644 --- a/CONFLICT.md +++ b/CONFLICT.md @@ -1 +1,2 @@ base v2 CHANGED differently +head resolved on top of base v2