diff --git a/blocks/test.js b/blocks/test.js index be4e890..0ab99ba 100644 --- a/blocks/test.js +++ b/blocks/test.js @@ -21,4 +21,12 @@ function createdOnMainAndChangedAfterWithMerge() { console.log('This creates the function on main branch') console.log('First change on test branch') console.log('Second change on test branch') + console.log('Changed on main branch') +} + +function test_changedAfterMergeWithMerge() { + console.log('This creates the function') + console.log('Second change on test branch') + console.log('Changed again on another branch') + console.log('Changed second time on another branch') } \ No newline at end of file