diff --git a/1 b/1 new file mode 100644 index 0000000..5e50d75 --- /dev/null +++ b/1 @@ -0,0 +1,6 @@ +Merge branch 'release' +# 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.