From e07feb4c5f230bc7e1a130c691afa5935ffa607e Mon Sep 17 00:00:00 2001
From: Claudio Atzori <claudio.atzori@isti.cnr.it>
Date: Thu, 7 May 2020 11:42:46 +0200
Subject: [PATCH] removed spurious file

---
 : | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 :

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.