diff --git a/Demo_Conflicts.md b/Demo_Conflicts.md index 4f441e5..e8e067f 100644 --- a/Demo_Conflicts.md +++ b/Demo_Conflicts.md @@ -1,3 +1,8 @@ # Demo Conflicts You can create lots of conflicts here to test the merging process. + + +JHH + +NEW JHHHH