diff --git a/: b/:
deleted file mode 100644
index 7768c1527..000000000
--- a/:
+++ /dev/null
@@ -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.