merge

bitfocus · Aug 7, 2024 · a3e06e8 · a3e06e8
1 parent 6c2e2ba
commit a3e06e8
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/merge 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.