diff --git a/merge b/merge new file mode 100644 index 0000000..a2a10c8 --- /dev/null +++ b/merge @@ -0,0 +1,6 @@ +Merge branch 'main' of https://github.com/bitfocus/companion-module-axeltechnology-youplay +# Please enter a commit message to explain why this merge is necessary, +# especially if it merges an updated upstream into a topic branch. +# +# Lines starting with '#' will be ignored, and an empty message aborts +# the commit.