diff --git a/1 b/1 deleted file mode 100644 index 258f8b9a897bebda9fb9612a0e1efaffbcf2d7ff..0000000000000000000000000000000000000000 --- a/1 +++ /dev/null @@ -1,7 +0,0 @@ -Merge branch 'simplesamlphp-1.19' of https://github.com/simplesamlphp/simplesamlphp into simplesamlphp-1.19 - -# 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.