forked from D-Net/dnet-hadoop
removed spurious file
This commit is contained in:
parent
5b3f8a0e90
commit
e07feb4c5f
7
:
7
:
|
@ -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.
|
Loading…
Reference in New Issue