removed spurious file

This commit is contained in:
Claudio Atzori 2020-05-07 11:42:46 +02:00
parent 5b3f8a0e90
commit e07feb4c5f
1 changed files with 0 additions and 7 deletions

7
:
View File

@ -1,7 +0,0 @@
Merge remote-tracking branch 'upstream/master'
# 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.